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

svn path=/main/branches/2.1.2/; revision=6043

diff --git a/pym/portage.py b/pym/portage.py
index 2ab0a7c6124fbaaeed95710f7adad266a1faf06d..ee7a4a806d40ed2569bf987266dd8a2f9f7784cf 100644 (file)
--- 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 225638e508530650fca276fd5f4416100d74ee36..3eb95751bdfa11cebe3a8f18f9314d7e9c7c6400 100644 (file)
--- 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: