Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 380295
Collapse All | Expand All

(-)a/pym/portage/package/ebuild/fetch.py (-3 / +13 lines)
Lines 364-369 Link Here
364
	else:
364
	else:
365
		mydigests = digests
365
		mydigests = digests
366
366
367
	listheader = 0
368
	if listonly:
369
		listheader = mysettings.get("PORTAGE_FETCH_LISTHEADER", "${nl}")
370
					
367
	ro_distdirs = [x for x in \
371
	ro_distdirs = [x for x in \
368
		shlex_split(mysettings.get("PORTAGE_RO_DISTDIRS", "")) \
372
		shlex_split(mysettings.get("PORTAGE_RO_DISTDIRS", "")) \
369
		if os.path.isdir(x)]
373
		if os.path.isdir(x)]
Lines 576-582 Link Here
576
		has_space_superuser = True
580
		has_space_superuser = True
577
		file_lock = None
581
		file_lock = None
578
		if listonly:
582
		if listonly:
579
			writemsg_stdout("\n", noiselevel=-1)
583
			listonly_dolist = not os.path.isfile(myfile_path) or \
584
				(pruned_digests is not None and not verify_all(myfile_path, pruned_digests)[0])
585
			if listonly_dolist:
586
				variables = dict(pruned_digests, file=myfile, nl='\n', tab='\t')
587
				variables["size"] = str(size)
588
				writemsg_stdout(varexpand(listheader, variables), noiselevel=-1)
580
		else:
589
		else:
581
			# check if there is enough space in DISTDIR to completely store myfile
590
			# check if there is enough space in DISTDIR to completely store myfile
582
			# overestimate the filesize so we aren't bitten by FS overhead
591
			# overestimate the filesize so we aren't bitten by FS overhead
Lines 826-832 Link Here
826
					continue
835
					continue
827
				tried_locations.add(loc)
836
				tried_locations.add(loc)
828
				if listonly:
837
				if listonly:
829
					writemsg_stdout(loc+" ", noiselevel=-1)
838
					if listonly_dolist:
839
						writemsg_stdout(loc+" ", noiselevel=-1)
830
					continue
840
					continue
831
				# allow different fetchcommands per protocol
841
				# allow different fetchcommands per protocol
832
				protocol = loc[0:loc.find("://")]
842
				protocol = loc[0:loc.find("://")]
Lines 1092-1098 Link Here
1092
				unlockfile(file_lock)
1102
				unlockfile(file_lock)
1093
				file_lock = None
1103
				file_lock = None
1094
1104
1095
		if listonly:
1105
		if listonly and listonly_dolist:
1096
			writemsg_stdout("\n", noiselevel=-1)
1106
			writemsg_stdout("\n", noiselevel=-1)
1097
		if fetched != 2:
1107
		if fetched != 2:
1098
			if restrict_fetch and not restrict_fetch_msg:
1108
			if restrict_fetch and not restrict_fetch_msg:

Return to bug 380295