Gentoo Archives: gentoo-portage-dev

From: Zac Medico <zmedico@g.o>
To: gentoo-portage-dev@l.g.o
Cc: Zac Medico <zmedico@g.o>
Subject: [gentoo-portage-dev] [PATCH 1/2] quickpkg: revert accidental changes to "protect" function (bug 628010)
Date: Wed, 16 Aug 2017 22:20:18
Message-Id: 20170816221910.12498-1-zmedico@gentoo.org
1 Revert accidental changes to the "protect" function's return value
2 that were mixed in with changes to the "quickpkg_atom" function's
3 return value.
4
5 Fixes: cff2c0149142 ("Support different compressors for binary packages")
6 X-Gentoo-bug: 628010
7 X-Gentoo-bug-url: https://bugs.gentoo.org/628010
8 ---
9 bin/quickpkg | 6 +++---
10 1 file changed, 3 insertions(+), 3 deletions(-)
11
12 diff --git a/bin/quickpkg b/bin/quickpkg
13 index 392e9da22..3094dd0ae 100755
14 --- a/bin/quickpkg
15 +++ b/bin/quickpkg
16 @@ -111,16 +111,16 @@ def quickpkg_atom(options, infos, arg, eout):
17 in settings.features))
18 def protect(filename):
19 if not confprot.isprotected(filename):
20 - return 1
21 + return False
22 if include_unmodified_config:
23 file_data = contents[filename]
24 if file_data[0] == "obj":
25 orig_md5 = file_data[2].lower()
26 cur_md5 = perform_md5(filename, calc_prelink=1)
27 if orig_md5 == cur_md5:
28 - return 1
29 + return False
30 excluded_config_files.append(filename)
31 - return os.EX_OK
32 + return True
33 existing_metadata = dict(zip(fix_metadata_keys,
34 vardb.aux_get(cpv, fix_metadata_keys)))
35 category, pf = portage.catsplit(cpv)
36 --
37 2.13.0

Replies