diff options
author | Zac Medico <zmedico@gentoo.org> | 2007-02-22 21:48:59 +0000 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 21:48:59 +0000 |
commit | 6678dfc7db1d33c2f1669409ec6ec1556e8482ed (patch) | |
tree | 38995cd6035aaf749a5301a062f3e564cc5800d9 | |
parent | cf9aee882924a894d95e89526cb030e36f2a4043 (diff) | |
download | portage-6678dfc7db1d33c2f1669409ec6ec1556e8482ed.tar.gz portage-6678dfc7db1d33c2f1669409ec6ec1556e8482ed.tar.bz2 portage-6678dfc7db1d33c2f1669409ec6ec1556e8482ed.zip |
For bug #167667, use the existence of ${PORTDIR}/manifest1_obsolete to trigger the disabling of manifest1/digest file generation. This toggle is repo/overlay specific, allowing a specific overlay to drop manifest1 by adding the manifest1_obsolete file. (trunk r6040:6041)
svn path=/main/branches/2.1.2/; revision=6043
-rw-r--r-- | pym/portage.py | 5 | ||||
-rw-r--r-- | pym/portage_manifest.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pym/portage.py b/pym/portage.py index 2ab0a7c61..ee7a4a806 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -2692,8 +2692,11 @@ def digestgen(myarchives, mysettings, overwrite=1, manifestonly=0, myportdb=None writemsg("!!! Invalid SRC_URI for '%s'.\n" % cpv, noiselevel=-1) 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")) mf = Manifest(mysettings["O"], mysettings["DISTDIR"], - fetchlist_dict=fetchlist_dict) + fetchlist_dict=fetchlist_dict, manifest1_compat=manifest1_compat) # Don't require all hashes since that can trigger excessive # fetches when sufficient digests already exist. To ease transition # while Manifest 1 is being removed, only require hashes that will diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py index 225638e50..3eb95751b 100644 --- a/pym/portage_manifest.py +++ b/pym/portage_manifest.py @@ -425,7 +425,8 @@ class Manifest(object): else: distfilehashes = {} self.__init__(self.pkgdir, self.distdir, - fetchlist_dict=self.fetchlist_dict, from_scratch=True) + fetchlist_dict=self.fetchlist_dict, from_scratch=True, + manifest1_compat=self.compat) for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(self.pkgdir): break for f in pkgdir_files: |