summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2017-08-16 14:22:03 -0700
committerZac Medico <zmedico@gentoo.org>2017-08-16 14:22:09 -0700
commit31138fce479734a6db1fa7d162f3faf6b964bab2 (patch)
tree3886ee70e1c1a7c8444551d5447b6d97526bedce
parentNEWS: Add some more features that made it into 2.3.7 (diff)
downloadportage-31138fce479734a6db1fa7d162f3faf6b964bab2.tar.gz
portage-31138fce479734a6db1fa7d162f3faf6b964bab2.tar.bz2
portage-31138fce479734a6db1fa7d162f3faf6b964bab2.zip
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
-rwxr-xr-xbin/quickpkg6
1 files 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)