From: Zac Medico <zmedico@gentoo.org>
Date: Wed, 15 Aug 2007 20:34:01 +0000 (-0000)
Subject: For bug #187806, use mkstemp to create tmpservertimestampfile (instead of using PORTA... 
X-Git-Tag: v2.1.2.12~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f5fbbc14b0c58b94bc129c8e098676d86de8684;p=portage.git

For bug #187806, use mkstemp to create tmpservertimestampfile (instead of using PORTAGE_TMPDIR). (branches/2.1.2 r7577)

svn path=/main/branches/2.1.2.9/; revision=7615
---

diff --git a/bin/emerge b/bin/emerge
index 0543338d2..0f75d7d35 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -3923,7 +3923,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 	if myaction == "metadata":
 		print "skipping sync"
 		updatecache_flg = True
-		tmpservertimestampfile = None
 	elif syncuri[:8]=="rsync://":
 		if not os.path.exists("/usr/bin/rsync"):
 			print "!!! /usr/bin/rsync does not exist, so rsync support is disabled."
@@ -4038,9 +4037,6 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 		# Real local timestamp file.
 		servertimestampfile = os.path.join(
 			myportdir, "metadata", "timestamp.chk")
-		# Temporary file for remote server timestamp comparison.
-		tmpservertimestampfile = os.path.join(
-			settings["PORTAGE_TMPDIR"], "timestamp.chk")
 
 		content = portage_util.grabfile(servertimestampfile)
 		mytimestamp = 0
@@ -4154,6 +4150,10 @@ def action_sync(settings, trees, mtimedb, myopts, myaction):
 			# connection attempt to an unresponsive server which rsync's
 			# --timeout option does not prevent.
 			if True:
+				# Temporary file for remote server timestamp comparison.
+				from tempfile import mkstemp
+				fd, tmpservertimestampfile = mkstemp()
+				os.close(fd)
 				mycommand = rsynccommand[:]
 				mycommand.append(dosyncuri.rstrip("/") + \
 					"/metadata/timestamp.chk")