Disable PORTAGE_PACKAGE_EMPTY_ABORT by default since

the scrollkeeper-9999 upgrade will trigger a false
positive. Thanks to leio for reporting. (trunk r8724)

svn path=/main/branches/2.1.2/; revision=8725

diff --git a/pym/portage.py b/pym/portage.py
index e4e3dca7e8ee3b729aaa60972543754582a0f09a..9e14be1b6ff9a5acb344a905a6d4d9a4da2252c7 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -8424,7 +8424,7 @@ class dblink:
 
                # 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 others_in_slot:
                        installed_files = None
                        for other_dblink in others_in_slot: