Fix syntax, cleanup whitespace, change some defaults, build firefox instead of xulrunner.

5 files changed, 11 insertions, 11 deletions

diff --git a/build_functions.py b/build_functions.py
index 51a4184..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')
diff --git a/build_nss.py b/build_nss.py
index ea70ccd..8c4a416 100755
--- a/build_nss.py
+++ b/build_nss.py
@@ -66,7 +66,7 @@ parser.add_argument('-l', '--local',
 parser.add_argument('-mm', '--mailme', 
                     action="store_true", dest="mailMe", 
                     default=False,
-                    help='send email to emaldona@redhat.com. [default=False')
+                    help='send email to emaldona@redhat.com. [default=False]')
 
 parser.add_argument('-sb', '--skipbuild', 
                     action="store_true", dest="skipBuild", 
@@ -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='+', 
diff --git a/build_nss.sh b/build_nss.sh
index add15ab..6910f54 100755
--- a/build_nss.sh
+++ b/build_nss.sh
@@ -28,7 +28,7 @@ mock -r fedora-${dist}-${arch} --init
 nss_pkgs="nspr nss-util nss-softokn nss"
 nss_pkgs=${nss_pkgs:-$nss_pkgs}
 
-# listed in rough order of importance and dependencies firt
+# listed in rough order of importance and dependencies
 all_clients="mod_nss mod_revocator curl evolution-data-server libreswan firefox crypto-utils crontabs dconf"
 clients=${clients:-$all_clients}
 workdir=`pwd`
diff --git a/checkout-all-packages.sh b/checkout-all-packages.sh
index e5338a9..be383d4 100755
--- a/checkout-all-packages.sh
+++ b/checkout-all-packages.sh
@@ -25,7 +25,7 @@ remove_pkgs() {
 
 #----------------------------------------------------------
 nssPkgs="nspr nss-util nss-softokn nss"
-clientPkgs="crypto-utils curl evolution-data-server mod_nss libreswan xulrunner"
+clientPkgs="crypto-utils curl evolution-data-server mod_nss libreswan firefox"
 
 # default
 branch=master
diff --git a/prepare-all-srpms.sh b/prepare-all-srpms.sh
index 5d8f53f..c275c5a 100755
--- a/prepare-all-srpms.sh
+++ b/prepare-all-srpms.sh
@@ -43,7 +43,7 @@ checkout_and_srpm_pkgs() {
 
 #----------------------------------------------------------
 nssPkgs="nspr nss-util nss-softokn nss"
-clientPkgs="crypto-utils curl evolution-data-server libreswan xulrunner"
+clientPkgs="crypto-utils curl evolution-data-server libreswan firefox"
 
 # default
 branch=master