[commits] (bear) [11169] hmm, local variable named the same as a module - wonder who wins that scope fight?

[commits]

Title: [commits] (bear) [11169] hmm, local variable named the same as a module - wonder who wins that scope fight?

Revision

11169

Author

bear

Date

2006-07-14 11:29:34 -0700 (Fri, 14 Jul 2006)

Log Message

hmm, local variable named the same as a module - wonder who wins that scope fight?
This fixes the issue that osx was having running full builds

Modified Paths

• trunk/hardhat/tinderbox.py

Diff

Modified: trunk/hardhat/tinderbox.py (11168 => 11169)

--- trunk/hardhat/tinderbox.py	2006-07-14 17:39:11 UTC (rev 11168)
+++ trunk/hardhat/tinderbox.py	2006-07-14 18:29:34 UTC (rev 11169)
@@ -335,23 +335,23 @@
         log.write("skipping rsync to staging area, no dir\n")
     else:
         if os.name == 'nt' or sys.platform == 'cygwin':
-            platform = 'windows'
+            buildplatform = 'windows'
         elif sys.platform == 'darwin':
             if platform.processor() == 'i386':
-                platform = 'maciosx'
+                buildplatform = 'maciosx'
             else:
-                platform = 'macosx'
+                buildplatform = 'macosx'
         else:
-            platform = 'linux'
+            buildplatform = 'linux'
 
         print "Rsyncing to staging area..."
         log.write('rsync -e ssh -avzp ' + timestamp + ' ' +
                   rsyncServer + ':staging/' +
-                  platform)
+                  buildplatform)
         outputList = hardhatutil.executeCommandReturnOutputRetry(
          [rsyncProgram, "-e", "ssh", "-avzp",
          timestamp,
-         rsyncServer + ":staging/" + platform])
+         rsyncServer + ":staging/" + buildplatform])
         hardhatutil.dumpOutputList(outputList, log)
 
         completedFile = timestamp + os.sep + "completed"
@@ -359,11 +359,11 @@
 
         log.write('rsync -e ssh -avzp ' + completedFile + ' ' +
                   rsyncServer + ':staging/' +
-                  platform + "/" + timestamp)
+                  buildplatform + "/" + timestamp)
         outputList = hardhatutil.executeCommandReturnOutputRetry(
          [rsyncProgram, "-e", "ssh", "-avzp",
          completedFile,
-         rsyncServer + ":staging/" + platform + "/" + timestamp])
+         rsyncServer + ":staging/" + buildplatform + "/" + timestamp])
         hardhatutil.dumpOutputList(outputList, log)
 
         hardhatutil.rmdirRecursive(timestamp)

_______________________________________________
Commits mailing list
Commits@osafoundation.org
http://lists.osafoundation.org/mailman/listinfo/commits