diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-01-31 20:04:56 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-01-31 20:04:56 +0000 |
| commit | e2d1400465eca5a7c3378f0f59b118c8a4d03fe2 (patch) | |
| tree | 28bc949c9f500d1180a6eb088f62ab2b1e63f32f | |
| parent | 275cacc1873a4a65d311cfa562b9e7350b1730a4 (diff) | |
| download | portage-e2d1400465eca5a7c3378f0f59b118c8a4d03fe2.tar.gz portage-e2d1400465eca5a7c3378f0f59b118c8a4d03fe2.tar.bz2 portage-e2d1400465eca5a7c3378f0f59b118c8a4d03fe2.zip | |
Unconditionally disable manifest1 compatibility since it's been dropped
from the main tree and nobody needs it anymore.
svn path=/main/trunk/; revision=9252
| -rwxr-xr-x | bin/repoman | 5 | ||||
| -rw-r--r-- | pym/portage/__init__.py | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/bin/repoman b/bin/repoman index a43f95c4b..6430edd7a 100755 --- 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 4a9283ab2..0dc6f1c40 100644 --- 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 |