diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2017-08-16 14:37:48 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2017-08-16 15:18:26 -0700 |
| commit | fb199967a38ebb563e51ba50ceb413942b7ece98 (patch) | |
| tree | 3f1ee77432571f15d93f02f3e6926e10f07c785d | |
| parent | quickpkg: revert accidental changes to "protect" function (bug 628010) (diff) | |
| download | portage-fb199967a38ebb563e51ba50ceb413942b7ece98.tar.gz portage-fb199967a38ebb563e51ba50ceb413942b7ece98.tar.bz2 portage-fb199967a38ebb563e51ba50ceb413942b7ece98.zip | |
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
| -rwxr-xr-x | bin/quickpkg | 8 |
1 files 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'] |