From f1d21db028b643c9d6a85afb2dfd6acb35ea52a1 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Wed, 13 Jul 2011 17:36:24 -0700 Subject: [PATCH] Revert "ebuild(1): allow-missing-manifests for fetch" This reverts commit 62712db56bb863b4eb0a9d9c52e7b2c3ad38df66. This code already defaulted to the allow-missing-manifests behavior, since the fetch() allow_missing_digests argument default is true. By making the argument conditional on allow-missing-manifests, it changed the behavior in the default case where allow-missing-manifests is disabled. --- pym/portage/package/ebuild/doebuild.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py index 26afbc28e..1849af94f 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -764,11 +764,9 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0, fetchme = aalist else: fetchme = alist - allow_missing_manifests = \ - "allow-missing-manifests" in mysettings.features + if not fetch(fetchme, mysettings, listonly=listonly, - fetchonly=fetchonly, - allow_missing_digests=allow_missing_manifests): + fetchonly=fetchonly, allow_missing_digests=True): spawn_nofetch(mydbapi, myebuild, settings=mysettings) if listonly: # The convention for listonly mode is to report -- 2.26.2