Attachment #79915 for bug #122996




			sys.exit(1)
		mytimeout=180
		if portage.settings.has_key("RSYNC_TIMEOUT"):
			print "WARNING: usage of RSYNC_TIMEOUT is deprecated, use PORTAGE_RSYNC_OPTS instead"
			try:
				mytimeout=int(portage.settings["RSYNC_TIMEOUT"])
				rsync_flags.append("--timeout=%d" % mytimeout)
			except SystemExit, e:
				raise # Needed else can't exit
			except:
				pass

		if (not portage.settings.has_key("PORTAGE_RSYNC_OPTS")) \
				or portage.settings["PORTAGE_RSYNC_OPTS"] == "":
			print "PORTAGE_RSYNC_OPTS empty or unset, using hardcoded defaults"
			rsync_flags = [
				"--recursive",    # Recurse directories
				"--links",        # Consider symlinks
				"--safe-links",   # Ignore links outside of tree
				"--perms",        # Preserve permissions
				"--times",        # Preserive mod times
				"--compress",     # Compress the data transmitted
				"--force",        # Force deletion on non-empty dirs
				"--whole-file",   # Don't do block transfers, only entire files
				"--delete",       # Delete files that aren't in the master tree
				"--delete-after", # Delete only after everything else is done
				"--stats",        # Show final statistics about what was transfered
				"--timeout="+str(mytimeout), # IO timeout if not done in X seconds
				"--exclude='/distfiles'",   # Exclude distfiles from consideration
				"--exclude='/local'",       # Exclude local     from consideration
				"--exclude='/packages'",    # Exclude packages  from consideration
			]
			rsync_opts = ""
		else:
			# handle default opts later
			print "using PORTAGE_RSYNC_OPTS instead of hardcoded defaults"
			rsync_flags = []
			rsync_opts = portage.settings["PORTAGE_RSYNC_OPTS"]

			# TODO: determine required options
			for opt in ["--recursive","--times"]:
				if not rsync_opts.find(opt) >= 0:
					print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
					rsync_flags.append(opt)

			# TODO: determine options required for official servers
			if syncuri.rstrip("/").endswith(".gentoo.org/gentoo-portage"):
				if not rsync_opts.find("--timeout") >= 0:
					rsync_flags.append("--timeout=180")
				for opt in ["--compress", "--whole-file"]:
					if not rsync_opts.find(opt) >= 0:
						print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
						rsync_flags.append(opt)
				for exclude in ["distfiles","local","packages"]:
					opt = "--exclude='/"+exclude+"'"
					if not rsync_opts.find(opt) >= 0:
						print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
						rsync_flags.append(opt)

		if "--quiet" in myopts:
			rsync_flags.append("--quiet")    # Shut up a lot

			rsync_flags.append("--checksum") # Force checksum on all files

		if portage.settings.has_key("RSYNC_EXCLUDEFROM"):
			print yellow("WARNING:")+" usage of RSYNC_EXCLUDEFROM is deprecated, use PORTAGE_RSYNC_OPTS instead"
			if os.path.exists(portage.settings["RSYNC_EXCLUDEFROM"]):
				rsync_flags.append("--exclude-from="+portage.settings["RSYNC_EXCLUDEFROM"])
			else:
				print "!!! RSYNC_EXCLUDEFROM specified, but file does not exist."

		if portage.settings.has_key("RSYNC_RATELIMIT"):
			print yellow("WARNING:")+" usage of RSYNC_RATELIMIT is deprecated, use PORTAGE_RSYNC_OPTS instead"
			rsync_flags.append("--bwlimit="+portage.settings["RSYNC_RATELIMIT"])

		rsynccommand = "/usr/bin/rsync " + rsync_opts + " " + string.join(rsync_flags, " ")

		print rsynccommand

		servertimestampdir  = portage.settings.depcachedir+"/"
		servertimestampfile = portage.settings.depcachedir+"/timestamp.chk"

Lines 52-58 Link Here

(-)cnf/make.globals.org (-1 / +3 lines)
52	RSYNC_RETRIES="3"	52	RSYNC_RETRIES="3"
53		53
54	# Number of seconds rsync will wait before timing out.	54	# Number of seconds rsync will wait before timing out.
55	RSYNC_TIMEOUT="180"	55	#RSYNC_TIMEOUT="180"
		56
		57	PORTAGE_RSYNC_OPTS="--recursive --links --safe-links --perms --times --compress --force --whole-file --delete --delete-after --stats --timeout=180 --exclude='/distfiles' --exclude='/local' --exclude='/packages'"
56		58
57	# Minimal CONFIG_PROTECT	59	# Minimal CONFIG_PROTECT
58	CONFIG_PROTECT="/etc"	60	CONFIG_PROTECT="/etc"

Return to bug 122996

Lines 2550-2579 Link Here

(-)bin/emerge.org (-18 / +53 lines)
2550	sys.exit(1)	2550	sys.exit(1)
2551	mytimeout=180	2551	mytimeout=180
2552	if portage.settings.has_key("RSYNC_TIMEOUT"):	2552	if portage.settings.has_key("RSYNC_TIMEOUT"):
		2553	print "WARNING: usage of RSYNC_TIMEOUT is deprecated, use PORTAGE_RSYNC_OPTS instead"
2553	try:	2554	try:
2554	mytimeout=int(portage.settings["RSYNC_TIMEOUT"])	2555	mytimeout=int(portage.settings["RSYNC_TIMEOUT"])
		2556	rsync_flags.append("--timeout=%d" % mytimeout)
2555	except SystemExit, e:	2557	except SystemExit, e:
2556	raise # Needed else can't exit	2558	raise # Needed else can't exit
2557	except:	2559	except:
2558	pass	2560	pass
2559		2561
2560	rsync_flags = [	2562	if (not portage.settings.has_key("PORTAGE_RSYNC_OPTS")) \
2561	"--recursive", # Recurse directories	2563	or portage.settings["PORTAGE_RSYNC_OPTS"] == "":
2562	"--links", # Consider symlinks	2564	print "PORTAGE_RSYNC_OPTS empty or unset, using hardcoded defaults"
2563	"--safe-links", # Ignore links outside of tree	2565	rsync_flags = [
2564	"--perms", # Preserve permissions	2566	"--recursive", # Recurse directories
2565	"--times", # Preserive mod times	2567	"--links", # Consider symlinks
2566	"--compress", # Compress the data transmitted	2568	"--safe-links", # Ignore links outside of tree
2567	"--force", # Force deletion on non-empty dirs	2569	"--perms", # Preserve permissions
2568	"--whole-file", # Don't do block transfers, only entire files	2570	"--times", # Preserive mod times
2569	"--delete", # Delete files that aren't in the master tree	2571	"--compress", # Compress the data transmitted
2570	"--delete-after", # Delete only after everything else is done	2572	"--force", # Force deletion on non-empty dirs
2571	"--stats", # Show final statistics about what was transfered	2573	"--whole-file", # Don't do block transfers, only entire files
2572	"--timeout="+str(mytimeout), # IO timeout if not done in X seconds	2574	"--delete", # Delete files that aren't in the master tree
2573	"--exclude='/distfiles'", # Exclude distfiles from consideration	2575	"--delete-after", # Delete only after everything else is done
2574	"--exclude='/local'", # Exclude local from consideration	2576	"--stats", # Show final statistics about what was transfered
2575	"--exclude='/packages'", # Exclude packages from consideration	2577	"--timeout="+str(mytimeout), # IO timeout if not done in X seconds
2576	]	2578	"--exclude='/distfiles'", # Exclude distfiles from consideration
		2579	"--exclude='/local'", # Exclude local from consideration
		2580	"--exclude='/packages'", # Exclude packages from consideration
		2581	]
		2582	rsync_opts = ""
		2583	else:
		2584	# handle default opts later
		2585	print "using PORTAGE_RSYNC_OPTS instead of hardcoded defaults"
		2586	rsync_flags = []
		2587	rsync_opts = portage.settings["PORTAGE_RSYNC_OPTS"]
		2588
		2589	# TODO: determine required options
		2590	for opt in ["--recursive","--times"]:
		2591	if not rsync_opts.find(opt) >= 0:
		2592	print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
		2593	rsync_flags.append(opt)
		2594
		2595	# TODO: determine options required for official servers
		2596	if syncuri.rstrip("/").endswith(".gentoo.org/gentoo-portage"):
		2597	if not rsync_opts.find("--timeout") >= 0:
		2598	rsync_flags.append("--timeout=180")
		2599	for opt in ["--compress", "--whole-file"]:
		2600	if not rsync_opts.find(opt) >= 0:
		2601	print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
		2602	rsync_flags.append(opt)
		2603	for exclude in ["distfiles","local","packages"]:
		2604	opt = "--exclude='/"+exclude+"'"
		2605	if not rsync_opts.find(opt) >= 0:
		2606	print yellow("WARNING:")+" adding required option %s not included in PORTAGE_RSYNC_OPTS" % opt
		2607	rsync_flags.append(opt)
2577		2608
2578	if "--quiet" in myopts:	2609	if "--quiet" in myopts:
2579	rsync_flags.append("--quiet") # Shut up a lot	2610	rsync_flags.append("--quiet") # Shut up a lot
Lines 2587-2601 Link Here
2587	rsync_flags.append("--checksum") # Force checksum on all files	2618	rsync_flags.append("--checksum") # Force checksum on all files
2588		2619
2589	if portage.settings.has_key("RSYNC_EXCLUDEFROM"):	2620	if portage.settings.has_key("RSYNC_EXCLUDEFROM"):
		2621	print yellow("WARNING:")+" usage of RSYNC_EXCLUDEFROM is deprecated, use PORTAGE_RSYNC_OPTS instead"
2590	if os.path.exists(portage.settings["RSYNC_EXCLUDEFROM"]):	2622	if os.path.exists(portage.settings["RSYNC_EXCLUDEFROM"]):
2591	rsync_flags.append("--exclude-from="+portage.settings["RSYNC_EXCLUDEFROM"])	2623	rsync_flags.append("--exclude-from="+portage.settings["RSYNC_EXCLUDEFROM"])
2592	else:	2624	else:
2593	print "!!! RSYNC_EXCLUDEFROM specified, but file does not exist."	2625	print "!!! RSYNC_EXCLUDEFROM specified, but file does not exist."
2594		2626
2595	if portage.settings.has_key("RSYNC_RATELIMIT"):	2627	if portage.settings.has_key("RSYNC_RATELIMIT"):
		2628	print yellow("WARNING:")+" usage of RSYNC_RATELIMIT is deprecated, use PORTAGE_RSYNC_OPTS instead"
2596	rsync_flags.append("--bwlimit="+portage.settings["RSYNC_RATELIMIT"])	2629	rsync_flags.append("--bwlimit="+portage.settings["RSYNC_RATELIMIT"])
2597		2630
2598	rsynccommand = "/usr/bin/rsync " + string.join(rsync_flags, " ")	2631	rsynccommand = "/usr/bin/rsync " + rsync_opts + " " + string.join(rsync_flags, " ")
		2632
		2633	print rsynccommand
2599		2634
2600	servertimestampdir = portage.settings.depcachedir+"/"	2635	servertimestampdir = portage.settings.depcachedir+"/"
2601	servertimestampfile = portage.settings.depcachedir+"/timestamp.chk"	2636	servertimestampfile = portage.settings.depcachedir+"/timestamp.chk"