Tree - rpms/createrepo - CentOS Git server

Blob History Raw

		485652	`diff -up createrepo-0.9.9/createrepo/readMetadata.py.orig createrepo-0.9.9/createrepo/readMetadata.py`
		485652	`--- createrepo-0.9.9/createrepo/readMetadata.py.orig 2017-03-02 13:03:29.417076819 +0100`
		485652	`+++ createrepo-0.9.9/createrepo/readMetadata.py 2017-03-02 13:03:30.420070445 +0100`
		485652	`@@ -107,7 +107,16 @@ class MetadataIndex(object):`
		485652	`"""`
		485652	`if relpath in self.pkg_tups_by_path:`
		485652	`pkgtup = self.pkg_tups_by_path[relpath]`
		485652	`- return self._repo.sack.searchPkgTuple(pkgtup)[0]`
		485652	`+ pos = self._repo.sack.searchPkgTuple(pkgtup)`
		485652	`+ if len(pos) == 1:`
		485652	`+ return pos[0]`
		485652	`+ elif len(pos) > 1:`
		485652	`+ # Multiple matches for this pkgtup so look at their relpath`
		485652	`+ if self.opts.get('verbose'):`
		485652	`+ print _("Warning: Duplicate nevra detected for %s") % relpath`
		485652	`+ for po in pos:`
		485652	`+ if po.relativepath == relpath:`
		485652	`+ return po`
		485652	`return None`
		485652
		485652	`def cleanup(self):`