diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-22 21:37:10 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 21:37:10 +0000 |
| commit | 80b6f608cfc9c949734e12105842ff95905c10b2 (patch) | |
| tree | 03e07646bf17443e7715836e97b3ccadb0306bf8 | |
| parent | e0d5d3ae42039ccb444b844d5943856808c5fd14 (diff) | |
| download | portage-80b6f608cfc9c949734e12105842ff95905c10b2.tar.gz portage-80b6f608cfc9c949734e12105842ff95905c10b2.tar.bz2 portage-80b6f608cfc9c949734e12105842ff95905c10b2.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 buy adding the manifest1_obsolete file.
svn path=/main/trunk/; revision=6041
| -rw-r--r-- | pym/portage/__init__.py | 5 | ||||
| -rw-r--r-- | pym/portage/manifest.py | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 1b07b966d..ee46aeeaf 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -2614,8 +2614,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 732d403f8..24f933294 100644 --- a/pym/portage/manifest.py +++ b/pym/portage/manifest.py @@ -439,7 +439,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: |