[Commits] (heikki) Uh oh, managed to break tbox. Since they stopped, checking in the fix and also the unchecked changes that were laying around that would have caused conflicts. hardhat dir now fully in sync with CVS on tbox client machines.

Thu Aug 26 10:27:45 PDT 2004

Commit by: heikki
Modified files:
hardhat/tinderbox.py 1.13 1.14

Log message:
Uh oh, managed to break tbox. Since they stopped, checking in the fix and also the unchecked changes that were laying around that would have caused conflicts. hardhat dir now fully in sync with CVS on tbox client machines.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/hardhat/tinderbox.py.diff?r1=text&tr1=1.13&r2=text&tr2=1.14

Index: hardhat/tinderbox.py
diff -u hardhat/tinderbox.py:1.13 hardhat/tinderbox.py:1.14

--- hardhat/tinderbox.py:1.13	Thu Aug 26 09:39:12 2004
+++ hardhat/tinderbox.py	Thu Aug 26 10:27:44 2004
@@ -23,7 +23,6 @@
 adminAddr = "builds"
 defaultDomain = "@osafoundation.org"
 defaultRsyncServer = "192.168.101.46"      #  IP of current server
-skipRsync = False
 
 def main():
     global buildscriptFile, fromAddr, mailtoAddr, alertAddr, adminAddr, defaultDomain, defaultRsyncServer
@@ -45,7 +44,7 @@
       default=defaultRsyncServer, help="Net address of server where builds get uploaded \n"
       " [default] " + defaultRsyncServer)
     parser.add_option("-s", "--skipRSync", action="store_true", dest="skipRsync",
-      default=skipRsync, help="Skip rsync step \n"
+      default=False, help="Skip rsync step \n"
       " [default] False")
 
     (options, args) = parser.parse_args()
@@ -177,7 +176,7 @@
             else:
                 print "Rsyncing..."
                 outputList = hardhatutil.executeCommandReturnOutputRetry(
-                 [rsyncProgram, "-e", "ssh", "-avzp", "--delete",
+                 [rsyncProgram, "-e", "ssh", "-avzp",
                  outputDir + os.sep, 
                  options.rsyncServer + ":continuous/" + buildNameNoSpaces])
                 hardhatutil.dumpOutputList(outputList, log)
@@ -296,7 +295,7 @@
 def CreateIndex(outputDir, newDirName, nowString, buildName):
     """Generates an index.html page from the hint files that hardhat creates
     which contain the actual distro filenames"""
-    fileOut = file(outputDir+os.sep+"index.html", "w")
+    fileOut = file(outputDir+os.sep+buildName+"_index.html", "w")
     fileOut.write("<html><head><META HTTP-EQUIV=Pragma CONTENT=no-cache><link rel=Stylesheet href=http://www.osafoundation.org/css/OSAF.css type=text/css charset=iso-8859-1></head><body topmargin=0 leftmargin=0 marginwith=0 marginheight=0><img src=http://www.osafoundation.org/images/OSAFLogo.gif><table border=0><tr><td width=19>&nbsp;</td><td width=550>\n")
     fileOut.write("<h2>Chandler Build: " + nowString + " PDT (machine: " + buildName +")</h2>\n")
     for x in ["enduser", "developer"]:

