[Commits] (markie) Rethink initialization

[commits at osafoundation.org]

Commit by: markie
Modified files:
osaf/hardhat/buildscripts/chandler-newbuild.py 1.33 1.34

Log message:
Rethink initialization


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

Index: osaf/hardhat/buildscripts/chandler-newbuild.py
diff -u osaf/hardhat/buildscripts/chandler-newbuild.py:1.33 osaf/hardhat/buildscripts/chandler-newbuild.py:1.34
--- osaf/hardhat/buildscripts/chandler-newbuild.py:1.33	Sat Apr 24 21:07:02 2004
+++ osaf/hardhat/buildscripts/chandler-newbuild.py	Sat Apr 24 21:13:06 2004
@@ -44,7 +44,18 @@
         releaseModeDir = os.path.join(workingDir, releaseMode)
         if not os.path.exists(releaseModeDir):
             os.mkdir(releaseModeDir)
-        os.chdir(releaseModeDir)
+            os.chdir(releaseModeDir)
+            print "checking out external"
+            log.write("Checking out: external with " + cvsVintage + "\n")
+            outputList = hardhatutil.executeCommandReturnOutputRetry(
+             [cvsProgram, "-q", "checkout", cvsVintage, "external"])
+            hardhatutil.dumpOutputList(outputList, log)
+            print "checking out internal"
+            log.write("Checking out: internal with " + cvsVintage + "\n")
+            outputList = hardhatutil.executeCommandReturnOutputRetry(
+             [cvsProgram, "-q", "checkout", cvsVintage, "internal"])
+            hardhatutil.dumpOutputList(outputList, log)
+
         if releaseMode == "debug":
             dbgStr = "DEBUG=1"
             relStr = "debug"
@@ -60,17 +71,6 @@
             sourceTarball = os.path.join(extModuleDir, "sources-" + version + ".tar.gz")
             log.write("Checking for source tarball " + sourceTarball + "\n")
             if not os.path.exists(sourceTarball) :
-                print "checking out external"
-                log.write("Checking out: external with " + cvsVintage + "\n")
-                outputList = hardhatutil.executeCommandReturnOutputRetry(
-                 [cvsProgram, "-q", "checkout", cvsVintage, "external"])
-                hardhatutil.dumpOutputList(outputList, log)
-                print "checking out internal"
-                log.write("Checking out: internal with " + cvsVintage + "\n")
-                outputList = hardhatutil.executeCommandReturnOutputRetry(
-                 [cvsProgram, "-q", "checkout", cvsVintage, "internal"])
-                hardhatutil.dumpOutputList(outputList, log)
-
                 # Now need to do the setup for external - "expand" and "make"
                 os.chdir(extModuleDir)
                 log.write("Environment variables: \n")