[Commits] (markie) Fix syntax error

commits at osafoundation.org commits at osafoundation.org
Sat Apr 24 23:11:11 PDT 2004


Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.39 1.40

Log message:
Fix syntax error


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/osaf/hardhat/buildscripts/chandler-newbuild.py.diff?r1=text&tr1=1.39&r2=text&tr2=1.40

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.39 osaf/hardhat/buildscripts/chandler-newbuild.py:1.40
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.39	Sat Apr 24 22:51:23 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sat Apr 24 23:10:40 2004
@@ -105,21 +105,26 @@
                 outputList = hardhatutil.executeCommandReturnOutput(
                  [buildenv['make'], dbgStr, "binaries" ])
                 hardhatutil.dumpOutputList(outputList, log)
+                ret = "no_changes" 
 
         except Exception, e:
             print "an initialization error"
             log.write("***Error during initialization***" + "\n")
             log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
             CopyLog(os.path.join(releaseModeDir, logPath), log)
+            ret = "init_failed"
+            
+        finally:
             if releaseMode == "debug":
                 # OK to do release dir
                 continue
-            else 
-                return "init_failed"
+            elif ret ==  "init_failed":
+                return ret
 
     # do debug
-    ret = Do(hardhatScript, "debug", workingDir, outputDir, cvsVintage, 
-     buildVersion, clobber, log)
+    if ret == "no_changes":
+        ret = Do(hardhatScript, "debug", workingDir, outputDir, cvsVintage, 
+         buildVersion, clobber, log)
 
     if ret == "no_changes" or ret =="build_failed" or ret == "test_failed":
         modeDir = os.path.join(workingDir, "debug")



More information about the Commits mailing list