Attachment #161892 for bug #233487

View | Details | Raw Unified | Return to bug 233487
Collapse All | Expand All

Lines 5061-5067 Link Here

(-)pym/portage/__init__.py (-1 / +6 lines)
5061		5061
5062	clean_phases = ("clean", "cleanrm")	5062	clean_phases = ("clean", "cleanrm")
5063	validcommands = ["help","clean","prerm","postrm","cleanrm","preinst","postinst",	5063	validcommands = ["help","clean","prerm","postrm","cleanrm","preinst","postinst",
5064	"config","info","setup","depend","fetch","digest",	5064	"config", "info", "setup", "depend",
		5065	"fetch", "fetchall", "digest",
5065	"unpack","compile","test","install","rpm","qmerge","merge",	5066	"unpack","compile","test","install","rpm","qmerge","merge",
5066	"package","unmerge", "manifest"]	5067	"package","unmerge", "manifest"]
5067		5068
Lines 5076-5081 Link Here
5076	writemsg("\n", noiselevel=-1)	5077	writemsg("\n", noiselevel=-1)
5077	return 1	5078	return 1
5078		5079
		5080	if mydo == "fetchall":
		5081	fetchall = 1
		5082	mydo = "fetch"
		5083
5079	if mydo not in clean_phases and not os.path.exists(myebuild):	5084	if mydo not in clean_phases and not os.path.exists(myebuild):
5080	writemsg("!!! doebuild: %s not found for %s\n" % (myebuild, mydo),	5085	writemsg("!!! doebuild: %s not found for %s\n" % (myebuild, mydo),
5081	noiselevel=-1)	5086	noiselevel=-1)

Lines 2227-2233 Link Here

(-)pym/_emerge/__init__.py (-3 / +10 lines)
2227		2227
2228	class EbuildFetcher(SpawnProcess):	2228	class EbuildFetcher(SpawnProcess):
2229		2229
2230	__slots__ = ("fetchonly", "pkg",)	2230	__slots__ = ("fetchonly", "fetchall", "pkg",)
2231		2231
2232	def _start(self):	2232	def _start(self):
2233		2233
Lines 2235-2240 Link Here
2235	portdb = root_config.trees["porttree"].dbapi	2235	portdb = root_config.trees["porttree"].dbapi
2236	ebuild_path = portdb.findname(self.pkg.cpv)	2236	ebuild_path = portdb.findname(self.pkg.cpv)
2237	settings = root_config.settings	2237	settings = root_config.settings
		2238	phase = "fetch"
		2239	if self.fetchall:
		2240	phase = "fetchall"
2238		2241
2239	fetch_env = dict(settings.iteritems())	2242	fetch_env = dict(settings.iteritems())
2240	fetch_env["PORTAGE_NICENESS"] = "0"	2243	fetch_env["PORTAGE_NICENESS"] = "0"
Lines 2244-2250 Link Here
2244	ebuild_binary = os.path.join(	2247	ebuild_binary = os.path.join(
2245	settings["PORTAGE_BIN_PATH"], "ebuild")	2248	settings["PORTAGE_BIN_PATH"], "ebuild")
2246		2249
2247	fetch_args = [ebuild_binary, ebuild_path, "fetch"]	2250	fetch_args = [ebuild_binary, ebuild_path, phase]
2248	debug = settings.get("PORTAGE_DEBUG") == "1"	2251	debug = settings.get("PORTAGE_DEBUG") == "1"
2249	if debug:	2252	if debug:
2250	fetch_args.append("--debug")	2253	fetch_args.append("--debug")
Lines 2396-2402 Link Here
2396	if self.background:	2399	if self.background:
2397	fetch_log = self.scheduler.fetch.log_file	2400	fetch_log = self.scheduler.fetch.log_file
2398		2401
2399	fetcher = EbuildFetcher(fetchonly=opts.fetchonly,	2402	fetcher = EbuildFetcher(fetchall=opts.fetch_all_uri,
		2403	fetchonly=opts.fetchonly,
2400	background=self.background, logfile=fetch_log,	2404	background=self.background, logfile=fetch_log,
2401	pkg=pkg, scheduler=self.scheduler)	2405	pkg=pkg, scheduler=self.scheduler)
2402		2406
Lines 13399-13404 Link Here
13399	"--usepkg", "--usepkgonly"):	13403	"--usepkg", "--usepkgonly"):
13400	myopts.pop(opt, None)	13404	myopts.pop(opt, None)
13401		13405
		13406	if "--fetch-all-uri" in myopts:
		13407	myopts["--fetchonly"] = True
		13408
13402	if "--skipfirst" in myopts and "--resume" not in myopts:	13409	if "--skipfirst" in myopts and "--resume" not in myopts:
13403	myopts["--resume"] = True	13410	myopts["--resume"] = True
13404		13411

Return to bug 233487