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

(-)bin/emerge (-4 / +4 lines)
Lines 4443-4449 Link Here
4443
	if myaction == "metadata":
4443
	if myaction == "metadata":
4444
		print "skipping sync"
4444
		print "skipping sync"
4445
		updatecache_flg = True
4445
		updatecache_flg = True
4446
		tmpservertimestampfile = None
4447
	elif syncuri[:8]=="rsync://":
4446
	elif syncuri[:8]=="rsync://":
4448
		if not os.path.exists("/usr/bin/rsync"):
4447
		if not os.path.exists("/usr/bin/rsync"):
4449
			print "!!! /usr/bin/rsync does not exist, so rsync support is disabled."
4448
			print "!!! /usr/bin/rsync does not exist, so rsync support is disabled."
Lines 4558-4566 Link Here
4558
		# Real local timestamp file.
4557
		# Real local timestamp file.
4559
		servertimestampfile = os.path.join(
4558
		servertimestampfile = os.path.join(
4560
			myportdir, "metadata", "timestamp.chk")
4559
			myportdir, "metadata", "timestamp.chk")
4561
		# Temporary file for remote server timestamp comparison.
4562
		tmpservertimestampfile = os.path.join(
4563
			settings["PORTAGE_TMPDIR"], "timestamp.chk")
4564
4560
4565
		content = portage_util.grabfile(servertimestampfile)
4561
		content = portage_util.grabfile(servertimestampfile)
4566
		mytimestamp = 0
4562
		mytimestamp = 0
Lines 4674-4679 Link Here
4674
			# connection attempt to an unresponsive server which rsync's
4670
			# connection attempt to an unresponsive server which rsync's
4675
			# --timeout option does not prevent.
4671
			# --timeout option does not prevent.
4676
			if True:
4672
			if True:
4673
				# Temporary file for remote server timestamp comparison.
4674
				from tempfile import mkstemp
4675
				fd, tmpservertimestampfile = mkstemp()
4676
				os.close(fd)
4677
				mycommand = rsynccommand[:]
4677
				mycommand = rsynccommand[:]
4678
				mycommand.append(dosyncuri.rstrip("/") + \
4678
				mycommand.append(dosyncuri.rstrip("/") + \
4679
					"/metadata/timestamp.chk")
4679
					"/metadata/timestamp.chk")

Return to bug 187806