For bug #167667, use the existence of ${PORTDIR}/manifest1_obsolete to trigger the...

svn path=/main/trunk/; revision=6041

diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 1b07b966d796474d74ad6ac9de93e72556407b63..ee46aeeaf36549606b1a54c95d55e4f5aeed52bd 100644 (file)
--- 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 732d403f8ef92dfd6672ac0ac9742647d47b44e2..24f933294623dae1b5beab46c476d74b270bd648 100644 (file)
--- 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: