Use the simpler build_nss_pkgs function and fix warning regrading version.

1 files changed, 50 insertions, 0 deletions

diff --git a/build_functions.py b/build_functions.py
index d746957..8cd1419 100755
--- a/build_functions.py
+++ b/build_functions.py
@@ -298,6 +298,56 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, optionsDebug, mail
 ##########################################################################################
 
 ##########################################################################################
+def build_nss_pkgs(
+    package, 
+    buildDir, 
+    mock_cfg, 
+    flavor, 
+    scriptsDir, 
+    optionsDebug, 
+    mailTo):
+    def print_debug(msg):
+        if optionsDebug == True:
+            print "DEBUG: %s" % (msg)
+
+    dashes = "+" + 70 * "-" + "+"
+    pounds = 70 * "#"
+
+    def print_debug(msg):
+        if optionsDebug == True:
+            print "DEBUG: %s" % (msg)
+
+    print_debug("package %s" % package)
+    print_debug("mock_cfg %s" % mock_cfg)
+    print_debug("buildDir %s" % buildDir)
+    #if os.path.isdir(os.path.join(buildDir, package, ".git")):
+    #if os.path.isdir(resultsDir):
+    buildLogs = os.path.join(buildDir,"build_logs", mock_cfg)
+    print_debug("buildLogs: %s" % buildLogs)
+    if not os.path.exists(buildLogs):
+        os.makedirs(buildLogs)
+    os.chdir(buildLogs)
+    
+    print_debug("cwd %s" % os.getcwd())
+    print pounds
+    print "INFO: build_package() -> building %s for %s" % (package, mock_cfg)
+    print pounds
+
+    print "package = %s " % package
+    print "+-----------------------------------------------------+"
+    print "Starting to build %s" % package 
+    print "+-----------------------------------------------------+"
+    logFilePath = os.path.join(buildLogs, package + ".log")
+    logFile = open(logFilePath, "w") 
+    status = 0
+    for line in runProcess(['mock', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']):
+        logFile.write(line,)
+        print line,
+    print "Build status = %s for %s " %  (status, package)
+    return status
+#end build_nss_pkgs()
+
+##########################################################################################
 def build_generic_pkg(
     package, 
     buildDir,