particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid UnicodeDecodeErrors when writing out the metadata by ensuring that pkg attributes that end up in the xml are utf-8-encoded strs (not unicode objects)

Browse source
This commit is contained in:
Mike Bonnet 2009-02-09 13:21:38 -05:00
parent d463c3169d
commit e71e348b1f
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
builder/mergerepos
View file

@ -146,16 +146,25 @@ class RepoMerge():
# Check if that package was also from this repo, in
# which case it's likely just another subpackage from
# the same build.
if seen_srpms[srpm_name] == pkg.repoid:
origins.write('%s\t%s\n' % (pkg, repo.urls[0]))
else:
if seen_srpms[srpm_name] != pkg.repoid:
# Package has been superceded by a package
# from a higher priority repo
repo.sack.delPackage(pkg)
continue
elif self.blocked.has_key(srpm_name):
print >> sys.stderr, 'Removing blocked package: %s' % pkg
repo.sack.delPackage(pkg)
else:
seen_srpms[srpm_name] = pkg.repoid
origins.write('%s\t%s\n' % (pkg, repo.urls[0]))
continue
seen_srpms[srpm_name] = pkg.repoid
origins.write('%s\t%s\n' % (pkg, repo.urls[0]))
# XXX hack: ensure the package attributes are utf-8-encoded
# strs so yum doesn't choke when generating the XML.
# We need to re-encode pkgId because it is used in the value of
# pkg.checksum
for attr in ('pkgId', 'name', 'arch', 'epoch', 'ver', 'rel'):
if hasattr(pkg, attr):
setattr(pkg, attr, yum.misc.to_utf8(getattr(pkg, attr)))
origins.close()
self.mdconf.additional_metadata['origin'] = pkgorigins