Default clients to build is now the empty list.

2 files changed, 11 insertions, 11 deletions

diff --git a/build_functions.py b/build_functions.py
index f6f1fbe..9558012 100755
--- a/build_functions.py
+++ b/build_functions.py
@@ -13,7 +13,7 @@ import distutils.dir_util
 
 
 ##########################################################################################
-def email(message, mailTo):  
+def email(message, mailTo):
     import smtplib
     import socket
     # mail_server='smtp.corp.redhat.com'
@@ -199,15 +199,15 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, optionsDebug, mail
 #            scriptPath = scriptsDir + script
             
 #    for line in runProcess(['/home/kwright/scripts/srpm_timestamp.sh', SRPM, gitrev]):
-#         for line in runProcess([scriptPath, SRPM, gitrev]):
-#                print line,
+#        for line in runProcess([scriptPath, SRPM, gitrev]):
+#            print line,
 #            os.remove(SRPM)
 #            for fileName in os.listdir(SRPMS):
 #                if re.search(srpmPattern, fileName):
 #                    print_debug("fileName %s" % fileName)
 #                    SRPM = fileName
-#        else:
-#            print "INFO: This srpm has already been converted.\n"
+#                else:
+#                    print "INFO: This srpm has already been converted.\n"
         
         #resultsDir= '/var/lib/mock/' + mock_cfg + '/result'
         resultsDir= os.path.join('/var/lib/mock', mock_cfg, 'result')
@@ -340,7 +340,7 @@ def build_nss_pkgs(
     logFilePath = os.path.join(buildLogs, package + ".log")
     logFile = open(logFilePath, "w") 
     status = 0
-    for line in runProcess(['mock', '--no-cleanup-after', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']):
+    for line in runProcess(['mock', '--no-clean --no-cleanup-after', '-v', '-r', mock_cfg, '--shell', 'build_nss.sh']):
         logFile.write(line,)
         print line,
     print "Build status = %s for %s " %  (status, package)
diff --git a/build_nss.py b/build_nss.py
index 06edcac..8c4a416 100755
--- a/build_nss.py
+++ b/build_nss.py
@@ -92,9 +92,9 @@ parser.add_argument('-b', '--build',
 
 parser.add_argument('-c', '--clients', 
                     action='store', dest='clientPackageList', nargs='+',
-                    default=[ 'xulrunner' ],
+                    default=[ '' ],
                     help='specify a list of one of more builds to perform. ',
-                    choices=('mod_nss', 'mod_revocator', 'curl', 'evolution-data-server', 'libreswan', 'xulrunner'))
+                    choices=('', 'mod_nss', 'mod_revocator', 'curl', 'evolution-data-server', 'libreswan', 'xulrunner'))
 
 parser.add_argument('-m', '--mock_cfg', 
                     action="store", dest="mockCfgList", nargs='+', 
@@ -102,8 +102,8 @@ parser.add_argument('-m', '--mock_cfg',
                     help='specify a list of one or more mock configs to use.  [default = fedora-rawhide-i386", "fedora-rawhide-x86_64]',
                     choices=("fedora-rawhide-i386", "fedora-rawhide-x86_64"))
 
-parser.add_argument("-nc", "--no-cleanup-after", 
-                    action='store_true', dest="noCleanupAfter", default= "True", 
+parser.add_argument("-nc", "--no-clean", 
+                    action='store_true', dest="noClean", default= "True", 
                     help="don't cleanup the buildroot first")
 
 options  = parser.parse_args()
@@ -146,7 +146,7 @@ print_debug("skipWget = %s " % options.skipWget)
 print_debug("nssPackageList = %s " % options.nssPackageList)
 print_debug("clientPackageList = %s " % options.clientPackageList)
 print_debug("mockCfgList = %s " % options.mockCfgList)
-print_debug("noCleanupAfter = %s " % options.noCleanupAfter)
+print_debug("noClean = %s " % options.noClean)
 
 #######################################################
 mockCfgList=[]