summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2008-01-31 20:10:20 +0000
committerZac Medico <zmedico@gentoo.org>2008-01-31 20:10:20 +0000
commit2312191a6d250f5cd0b4810772b5d7449d05eca0 (patch)
tree98b081797758194e44b4feebca2caeae2762deea
parentfix typo (diff)
downloadportage-multirepo-2312191a6d250f5cd0b4810772b5d7449d05eca0.tar.gz
portage-multirepo-2312191a6d250f5cd0b4810772b5d7449d05eca0.tar.bz2
portage-multirepo-2312191a6d250f5cd0b4810772b5d7449d05eca0.zip
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
-rwxr-xr-xbin/repoman5
-rw-r--r--pym/portage.py3
2 files changed, 2 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman
index 02289768..a83ba6be 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 10f18c50..c844d6ff 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