Attachment #110767 for bug #167667

Lines 2692-2699 Link Here

(-)pym/portage.py (-1 / +4 lines)
2692	writemsg("!!! Invalid SRC_URI for '%s'.\n" % cpv, noiselevel=-1)	2692	writemsg("!!! Invalid SRC_URI for '%s'.\n" % cpv, noiselevel=-1)
2693	del e	2693	del e
2694	return 0	2694	return 0
		2695	mytree = os.path.dirname(os.path.dirname(mysettings["O"]))
		2696	manifest1_compat = not os.path.exists(
		2697	os.path.join(mytree, "manifest1_obsolete"))
2695	mf = Manifest(mysettings["O"], mysettings["DISTDIR"],	2698	mf = Manifest(mysettings["O"], mysettings["DISTDIR"],
2696	fetchlist_dict=fetchlist_dict)	2699	fetchlist_dict=fetchlist_dict, manifest1_compat=manifest1_compat)
2697	# Don't require all hashes since that can trigger excessive	2700	# Don't require all hashes since that can trigger excessive
2698	# fetches when sufficient digests already exist. To ease transition	2701	# fetches when sufficient digests already exist. To ease transition
2699	# while Manifest 1 is being removed, only require hashes that will	2702	# while Manifest 1 is being removed, only require hashes that will

Lines 425-431 Link Here

(-)pym/portage_manifest.py (-1 / +2 lines)
425	else:	425	else:
426	distfilehashes = {}	426	distfilehashes = {}
427	self.__init__(self.pkgdir, self.distdir,	427	self.__init__(self.pkgdir, self.distdir,
428	fetchlist_dict=self.fetchlist_dict, from_scratch=True)	428	fetchlist_dict=self.fetchlist_dict, from_scratch=True,
		429	manifest1_compat=self.compat)
429	for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(self.pkgdir):	430	for pkgdir, pkgdir_dirs, pkgdir_files in os.walk(self.pkgdir):
430	break	431	break
431	for f in pkgdir_files:	432	for f in pkgdir_files:

Return to bug 167667