Attachment #184401 for bug #261675

Lines 5952-5957 Link Here

(-)pym/portage/__init__.py (-1 / +3 lines)
5952	mycpv = "/".join((mysettings["CATEGORY"], mysettings["PF"]))	5952	mycpv = "/".join((mysettings["CATEGORY"], mysettings["PF"]))
5953		5953
5954	emerge_skip_distfiles = returnpid	5954	emerge_skip_distfiles = returnpid
		5955	emerge_skip_digest = returnpid
5955	# Only try and fetch the files if we are going to need them ...	5956	# Only try and fetch the files if we are going to need them ...
5956	# otherwise, if user has FEATURES=noauto and they run `ebuild clean	5957	# otherwise, if user has FEATURES=noauto and they run `ebuild clean
5957	# unpack compile install`, we will try and fetch 4 times :/	5958	# unpack compile install`, we will try and fetch 4 times :/
Lines 6008-6014 Link Here
6008	elif mydo == "digest":	6009	elif mydo == "digest":
6009	return not digestgen(aalist, mysettings, overwrite=1,	6010	return not digestgen(aalist, mysettings, overwrite=1,
6010	myportdb=mydbapi)	6011	myportdb=mydbapi)
6011	elif "digest" in mysettings.features:	6012	elif not emerge_skip_digest and not parallel_fetchonly and \
		6013	"digest" in mysettings.features:
6012	digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi)	6014	digestgen(aalist, mysettings, overwrite=0, myportdb=mydbapi)
6013	except portage.exception.PermissionDenied, e:	6015	except portage.exception.PermissionDenied, e:
6014	writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)	6016	writemsg("!!! Permission Denied: %s\n" % (e,), noiselevel=-1)

Lines 14572-14578 Link Here

(-)pym/_emerge/__init__.py (-1 / +8 lines)
14572	# Convert Atom instances to plain str.	14572	# Convert Atom instances to plain str.
14573	mtimedb["resume"]["favorites"] = [str(x) for x in favorites]	14573	mtimedb["resume"]["favorites"] = [str(x) for x in favorites]
14574		14574
14575	if ("--digest" in myopts) and not ("--fetchonly" in myopts or "--fetch-all-uri" in myopts):	14575	digest = '--digest' in myopts
		14576	if not digest:
		14577	for pkgsettings in mydepgraph.pkgsettings.itervalues():
		14578	if 'digest' in pkgsettings.features:
		14579	digest = True
		14580	break
		14581
		14582	if digest and '--fetchonly' not in myopts:
14576	for pkgline in mydepgraph.altlist():	14583	for pkgline in mydepgraph.altlist():
14577	if pkgline[0]=="ebuild" and pkgline[3]=="merge":	14584	if pkgline[0]=="ebuild" and pkgline[3]=="merge":
14578	y = trees[pkgline[1]]["porttree"].dbapi.findname(pkgline[2])	14585	y = trees[pkgline[1]]["porttree"].dbapi.findname(pkgline[2])

Return to bug 261675