Attachment #75564 for bug #62273




									os.unlink(mysettings["DISTDIR"]+"/"+myfile)
									fetched=0
								else:
									if os.environ.get("PORTAGE_QUIET", "") == "":
										for x_key in mydigests[myfile].keys():
											writemsg(">>> Previously fetched file: "+str(myfile)+" "+x_key+" ;-)\n")
									fetched=2
									break #No need to keep looking for this file, we have it!
					else:

									os.unlink(mysettings["DISTDIR"]+"/"+myfile)
									fetched=0
								else:
									if os.environ.get("PORTAGE_QUIET", "") == "":
										for x_key in mydigests[myfile].keys():
											writemsg(">>> "+str(myfile)+" "+x_key+" ;-)\n")
									fetched=2
									break
						except (OSError,IOError),e:

			print
			return 0
		else:
			if os.environ.get("PORTAGE_QUIET", "") == "":
				print ">>> checksums "+note+" ;-)",x
	return 1



Lines 934-942 Link Here

(-)bin/ebuild.sh (-1 / +3 lines)
934	}	934	}
935		935
936	dyn_package() {	936	dyn_package() {
		937	local tflags=""
937	trap "abort_package" SIGINT SIGQUIT	938	trap "abort_package" SIGINT SIGQUIT
938	cd "${PORTAGE_BUILDDIR}/image"	939	cd "${PORTAGE_BUILDDIR}/image"
939	tar cpvf - ./ \| bzip2 -f > ../bin.tar.bz2 \|\| die "Failed to create tarball"	940	[[ -n "${PORTAGE_QUIET}" ]] \|\| tflags="v"
		941	tar cp${tflags}f - ./ \| bzip2 -f > ../bin.tar.bz2 \|\| die "Failed to create tarball"
940	cd ..	942	cd ..
941	xpak build-info inf.xpak	943	xpak build-info inf.xpak
942	tbz2tool join bin.tar.bz2 inf.xpak "${PF}.tbz2"	944	tbz2tool join bin.tar.bz2 inf.xpak "${PF}.tbz2"

Return to bug 62273

Lines 1934-1941 Link Here

(-)pym/portage.py (-5 / +8 lines)
1934	os.unlink(mysettings["DISTDIR"]+"/"+myfile)	1934	os.unlink(mysettings["DISTDIR"]+"/"+myfile)
1935	fetched=0	1935	fetched=0
1936	else:	1936	else:
1937	for x_key in mydigests[myfile].keys():	1937	if os.environ.get("PORTAGE_QUIET", "") == "":
1938	writemsg(">>> Previously fetched file: "+str(myfile)+" "+x_key+" ;-)\n")	1938	for x_key in mydigests[myfile].keys():
		1939	writemsg(">>> Previously fetched file: "+str(myfile)+" "+x_key+" ;-)\n")
1939	fetched=2	1940	fetched=2
1940	break #No need to keep looking for this file, we have it!	1941	break #No need to keep looking for this file, we have it!
1941	else:	1942	else:
Lines 2037-2044 Link Here
2037	os.unlink(mysettings["DISTDIR"]+"/"+myfile)	2038	os.unlink(mysettings["DISTDIR"]+"/"+myfile)
2038	fetched=0	2039	fetched=0
2039	else:	2040	else:
2040	for x_key in mydigests[myfile].keys():	2041	if os.environ.get("PORTAGE_QUIET", "") == "":
2041	writemsg(">>> "+str(myfile)+" "+x_key+" ;-)\n")	2042	for x_key in mydigests[myfile].keys():
		2043	writemsg(">>> "+str(myfile)+" "+x_key+" ;-)\n")
2042	fetched=2	2044	fetched=2
2043	break	2045	break
2044	except (OSError,IOError),e:	2046	except (OSError,IOError),e:
Lines 2293-2299 Link Here
2293	print	2295	print
2294	return 0	2296	return 0
2295	else:	2297	else:
2296	print ">>> checksums "+note+" ;-)",x	2298	if os.environ.get("PORTAGE_QUIET", "") == "":
		2299	print ">>> checksums "+note+" ;-)",x
2297	return 1	2300	return 1
2298		2301
2299		2302