1 |
Revert premature return from the quickpkg_atom function for atoms |
2 |
that match multiple slots. This fixes it to create packages for |
3 |
all matched slots, rather than just the lowest version. |
4 |
|
5 |
Fixes: cff2c0149142 ("Support different compressors for binary packages") |
6 |
X-Gentoo-bug: 628060 |
7 |
X-Gentoo-bug-url: https://bugs.gentoo.org/628060 |
8 |
--- |
9 |
bin/quickpkg | 8 ++++---- |
10 |
1 file changed, 4 insertions(+), 4 deletions(-) |
11 |
|
12 |
diff --git a/bin/quickpkg b/bin/quickpkg |
13 |
index 3094dd0ae..81d6afa08 100755 |
14 |
--- a/bin/quickpkg |
15 |
+++ b/bin/quickpkg |
16 |
@@ -66,6 +66,7 @@ def quickpkg_atom(options, infos, arg, eout): |
17 |
|
18 |
matches = vardb.match(atom) |
19 |
pkgs_for_arg = 0 |
20 |
+ retval = 0 |
21 |
for cpv in matches: |
22 |
excluded_config_files = [] |
23 |
dblnk = vardb._dblink(cpv) |
24 |
@@ -177,20 +178,19 @@ def quickpkg_atom(options, infos, arg, eout): |
25 |
eout.eerror(str(e)) |
26 |
del e |
27 |
eout.eerror("Failed to create package: '%s'" % binpkg_path) |
28 |
- return 1 |
29 |
+ retval |= 1 |
30 |
else: |
31 |
eout.eend(0) |
32 |
infos["successes"].append((cpv, s.st_size)) |
33 |
infos["config_files_excluded"] += len(excluded_config_files) |
34 |
for filename in excluded_config_files: |
35 |
eout.ewarn("Excluded config: '%s'" % filename) |
36 |
- return os.EX_OK |
37 |
if not pkgs_for_arg: |
38 |
eout.eerror("Could not find anything " + \ |
39 |
"to match '%s'; skipping" % arg) |
40 |
infos["missing"].append(arg) |
41 |
- return 1 |
42 |
- return os.EX_OK |
43 |
+ retval |= 1 |
44 |
+ return retval |
45 |
|
46 |
def quickpkg_set(options, infos, arg, eout): |
47 |
eroot = portage.settings['EROOT'] |
48 |
-- |
49 |
2.13.0 |