commit: fb199967a38ebb563e51ba50ceb413942b7ece98
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 21:37:48 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 22:18:26 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=fb199967
quickpkg: revert premature return from quickpkg_atom (bug 628060)
Revert premature return from the quickpkg_atom function for atoms
that match multiple slots. This fixes it to create packages for
all matched slots, rather than just the lowest version.
Fixes: cff2c0149142 ("Support different compressors for binary packages")
X-Gentoo-bug: 628060
X-Gentoo-bug-url: https://bugs.gentoo.org/628060
bin/quickpkg | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/bin/quickpkg b/bin/quickpkg
index 3094dd0ae..81d6afa08 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -66,6 +66,7 @@ def quickpkg_atom(options, infos, arg, eout):
matches = vardb.match(atom)
pkgs_for_arg = 0
+ retval = 0
for cpv in matches:
excluded_config_files = []
dblnk = vardb._dblink(cpv)
@@ -177,20 +178,19 @@ def quickpkg_atom(options, infos, arg, eout):
eout.eerror(str(e))
del e
eout.eerror("Failed to create package: '%s'" %
binpkg_path)
- return 1
+ retval |= 1
else:
eout.eend(0)
infos["successes"].append((cpv, s.st_size))
infos["config_files_excluded"] +=
len(excluded_config_files)
for filename in excluded_config_files:
eout.ewarn("Excluded config: '%s'" % filename)
- return os.EX_OK
if not pkgs_for_arg:
eout.eerror("Could not find anything " + \
"to match '%s'; skipping" % arg)
infos["missing"].append(arg)
- return 1
- return os.EX_OK
+ retval |= 1
+ return retval
def quickpkg_set(options, infos, arg, eout):
eroot = portage.settings['EROOT']
