folkslinux
/
rpmlint
mirror of https://github.com/rpm-software-management/rpmlint.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Combine file langs into regular Pkg files list. 

git-svn-id: svn+ssh://rpmlint.zarb.org/home/projects/rpmlint/svn/trunk@1519 9bc8b190-ac0f-0410-8968-dc7d1f502856
This commit is contained in:
Ville Skyttä 2009-01-27 20:03:00 +00:00
parent 6b52c889a5
commit 49943888c0
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BinariesCheck.py
View File

@ -270,7 +270,7 @@ class BinariesCheck(AbstractCheck.AbstractCheck):
(directory, base) = dir_base(i[0])
try:
symlink = directory + bin_info.soname
(perm, owner, group, link, size, md5, mtime, rdev) = files[symlink]
(perm, owner, group, link, size, md5, mtime, rdev, lang) = files[symlink]
if link != i[0] and link != base and link != '':
printError(pkg, 'invalid-ldconfig-symlink', i[0], link)
except KeyError:

1
I18NCheck.py
View File

@ -100,7 +100,6 @@ class I18NCheck(AbstractCheck.AbstractCheck):
webapp = False
i18n_tags = pkg[HEADER_I18NTABLE] or ()
#i18n_files = pkg.langFiles()
for i in i18n_tags:
try:

20
Pkg.py
View File

@ -225,8 +225,6 @@ class Pkg:
finally:
os.close(fd)
self._lang_files = None
self.name = self.header[rpm.RPMTAG_NAME]
if self.isNoSource():
self.arch = 'nosrc'
@ -370,7 +368,6 @@ class Pkg:
self._ghost_files = []
self._missing_ok_files = []
self._files = {}
self._files_array = []
flags = self.header[rpm.RPMTAG_FILEFLAGS]
modes = self.header[rpm.RPMTAG_FILEMODES]
users = self.header[rpm.RPMTAG_FILEUSERNAME]
@ -380,6 +377,7 @@ class Pkg:
md5s = self.header[rpm.RPMTAG_FILEMD5S]
mtimes = self.header[rpm.RPMTAG_FILEMTIMES]
rdevs = self.header[rpm.RPMTAG_FILERDEVS]
langs = self.header[rpm.RPMTAG_FILELANGS]
# Get files according to rpm version
if v304:
files = self.header[rpm.RPMTAG_OLDFILENAMES]
@ -400,7 +398,6 @@ class Pkg:
files = self.header[rpm.RPMTAG_FILENAMES]
if files:
self._files_array = files
for idx in range(0, len(files)):
if flags[idx] & RPMFILE_CONFIG:
self._config_files.append(files[idx])
@ -415,20 +412,11 @@ class Pkg:
self._files[files[idx]] = (modes[idx], users[idx],
groups[idx], links[idx],
sizes[idx], md5s[idx],
mtimes[idx], rdevs[idx])
def langFiles(self):
if self._lang_files == None:
self._lang_files = {}
array = self.header[rpm.RPMTAG_FILELANGS]
if array:
for idx in range(0, len(array)):
self._lang_files[self._files_array[idx]] = array[idx]
return self._lang_files
mtimes[idx], rdevs[idx],
langs[idx])
def fileLang(self, f):
return self.langFiles()[f]
return self.files()[f][8]
# API to access dependency information
def obsoletes(self):