Unconditionally disable manifest1 compatibility since it's been dropped

from the main tree and nobody needs it anymore. (trunk r9252)

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

diff --git a/bin/repoman b/bin/repoman
index 022897683b542152f43455f9e1f654b4498ab5f8..a83ba6becac6726455e0c55cb710676ac1a6efa4 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -779,13 +779,10 @@ kwlist = set(portage.grabfile(os.path.join(portdir, "profiles", "arch.list")))
 if not kwlist:
        err("Couldn't read KEYWORDS from arch.list")
 
-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=[]
 if repolevel==2:

diff --git a/pym/portage.py b/pym/portage.py
index 10f18c5079de5557e150d1a540836561b6a88249..c844d6ff06d582fae726d332491a33ffa8476905 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3499,8 +3499,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