Unconditionally disable manifest1 compatibility since it's been dropped

from the main tree and nobody needs it anymore.

svn path=/main/trunk/; revision=9252

diff --git a/bin/repoman b/bin/repoman
index a43f95c4bd752d634c74fff5a061b54c87b9be86..6430edd7abb3f56623906a4939aa5891b37f97d4 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -540,13 +540,10 @@ if not kwlist:
        logging.fatal("Couldn't read KEYWORDS from arch.list")
        sys.exit(1)
 
-manifest1_compat = not os.path.exists(
-       os.path.join(portdir, "manifest1_obsolete"))
+manifest1_compat = False
 if portdir_overlay != portdir:
        kwlist.update(portage.grabfile(
                os.path.join(portdir_overlay, "profiles", "arch.list")))
-       manifest1_compat = not os.path.exists(
-               os.path.join(portdir_overlay, "manifest1_obsolete"))
 
 scanlist = utilities.FindPackagesToScan(repoman_settings, startdir, reposplit)
 scanlist.sort()

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 4a9283ab234e49bf59654b9463e255e8e7ab045f..0dc6f1c40cf6ed73ac6780f8b94bdc8f42a95272 100644 (file)
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -3527,8 +3527,7 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None
                                del e
                                return 0
                mytree = os.path.dirname(os.path.dirname(mysettings["O"]))
-               manifest1_compat = not os.path.exists(
-                       os.path.join(mytree, "manifest1_obsolete"))
+               manifest1_compat = False
                mf = Manifest(mysettings["O"], mysettings["DISTDIR"],
                        fetchlist_dict=fetchlist_dict, manifest1_compat=manifest1_compat)
                # Don't require all hashes since that can trigger excessive