From 2312191a6d250f5cd0b4810772b5d7449d05eca0 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 31 Jan 2008 20:10:20 +0000 Subject: 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 --- bin/repoman | 5 +---- pym/portage.py | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/repoman b/bin/repoman index 022897683..a83ba6bec 100755 --- 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 10f18c507..c844d6ff0 100644 --- 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 -- cgit v1.2.3-1-g7c22