commit: 31138fce479734a6db1fa7d162f3faf6b964bab2
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 21:22:03 2017 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 21:22:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=31138fce
quickpkg: revert accidental changes to "protect" function (bug 628010)
Revert accidental changes to the "protect" function's return value
that were mixed in with changes to the "quickpkg_atom" function's
return value.
Fixes: cff2c0149142 ("Support different compressors for binary packages")
X-Gentoo-bug: 628010
X-Gentoo-bug-url: https://bugs.gentoo.org/628010
bin/quickpkg | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/quickpkg b/bin/quickpkg
index 392e9da22..3094dd0ae 100755
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -111,16 +111,16 @@ def quickpkg_atom(options, infos, arg, eout):
in settings.features))
def protect(filename):
if not confprot.isprotected(filename):
- return 1
+ return False
if include_unmodified_config:
file_data = contents[filename]
if file_data[0] == "obj":
orig_md5 =
file_data[2].lower()
cur_md5 =
perform_md5(filename, calc_prelink=1)
if orig_md5 == cur_md5:
- return 1
+ return False
excluded_config_files.append(filename)
- return os.EX_OK
+ return True
existing_metadata = dict(zip(fix_metadata_keys,
vardb.aux_get(cpv, fix_metadata_keys)))
category, pf = portage.catsplit(cpv)
