From: Zac Medico Date: Wed, 28 Nov 2007 05:49:27 +0000 (-0000) Subject: Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since X-Git-Tag: v2.2_pre1~290 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c8e9acee36bde7f1044466d40546cd748701a2a4;p=portage.git Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since the scrollkeeper-9999 upgrade will trigger a false positive. Thanks to leio for reporting. svn path=/main/trunk/; revision=8724 --- diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 29019a53b..5bca2f8e2 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -1788,7 +1788,7 @@ class dblink(object): # If there are no files to merge, and an installed package in the same # slot has files, it probably means that something went wrong. - if self.settings.get("PORTAGE_PACKAGE_EMPTY_ABORT") != "0" and \ + if self.settings.get("PORTAGE_PACKAGE_EMPTY_ABORT") == "1" and \ not myfilelist and not mylinklist and others_in_slot: installed_files = None for other_dblink in others_in_slot: