build: Add a comment for the dict variable

Also move the creation of Files object down and use itervalues() instead
of iteritems().
This commit is contained in:
Fatih Aşıcı
2011-07-27 08:40:27 +00:00
parent 08cffda65e
commit 47c6a39e14
+5 -2
View File
@@ -921,7 +921,6 @@ class Builder:
def gen_files_xml(self, package): def gen_files_xml(self, package):
"""Generates files.xml using the path definitions in specfile and """Generates files.xml using the path definitions in specfile and
the files produced by the build system.""" the files produced by the build system."""
files = pisi.files.Files()
if package.debug_package: if package.debug_package:
install_dir = self.pkg_debug_dir() install_dir = self.pkg_debug_dir()
@@ -937,6 +936,7 @@ class Builder:
# FIXME: material collisions after expanding globs could be # FIXME: material collisions after expanding globs could be
# reported as errors # reported as errors
# Use a dict to avoid duplicate entries in files.xml.
d = {} d = {}
def add_path(path): def add_path(path):
@@ -956,9 +956,11 @@ class Builder:
st = os.stat(fpath) st = os.stat(fpath)
else: else:
st = os.lstat(fpath) st = os.lstat(fpath)
d[frpath] = pisi.files.FileInfo(path=frpath, type=ftype, permanent=permanent, d[frpath] = pisi.files.FileInfo(path=frpath, type=ftype, permanent=permanent,
size=fsize, hash=fhash, uid=str(st.st_uid), gid=str(st.st_gid), size=fsize, hash=fhash, uid=str(st.st_uid), gid=str(st.st_gid),
mode=oct(stat.S_IMODE(st.st_mode))) mode=oct(stat.S_IMODE(st.st_mode)))
if stat.S_IMODE(st.st_mode) & stat.S_ISUID: if stat.S_IMODE(st.st_mode) & stat.S_ISUID:
ctx.ui.warning(_("/%s has suid bit set") % frpath) ctx.ui.warning(_("/%s has suid bit set") % frpath)
@@ -967,7 +969,8 @@ class Builder:
for path in glob.glob(wildcard_path): for path in glob.glob(wildcard_path):
add_path(path) add_path(path)
for (p, fileinfo) in d.iteritems(): files = pisi.files.Files()
for fileinfo in d.itervalues():
files.append(fileinfo) files.append(fileinfo)
files_xml_path = util.join_path(self.pkg_dir(), ctx.const.files_xml) files_xml_path = util.join_path(self.pkg_dir(), ctx.const.files_xml)