From 25a44dc25bd1451095448916d35ba7d35189d9df Mon Sep 17 00:00:00 2001
From: Elio Maldonado <emaldona@redhat.com>
Date: Mon, 31 Dec 2012 13:28:23 -0800
Subject: More nss oriented changes

- Point the URL to fedora packages
- Temporarily change default list of packages to include curl and xulrunner
- TODO: add a command line option to specify nss client packages to build
---
 build-nss.py       |  7 ++++---
 build_functions.py | 20 ++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/build-nss.py b/build-nss.py
index 8c4ccc5..7e7a9ae 100755
--- a/build-nss.py
+++ b/build-nss.py
@@ -99,8 +99,9 @@ parser.add_argument(
                     action='store',
                     dest='nssPackageList',
                     nargs='+',
-                    default=['nspr', 'nss-util', 'nss-softokn', 'nss' ],
-                    help='specify a list of one of more builds to performm. ',
+                   #default=['nspr', 'nss-util', 'nss-softokn', 'nss' ],
+                    default=['nspr', 'nss-util', 'nss-softokn', 'nss', 'curl', 'xulrunner' ],
+                    help='specify a list of one of more builds to perform. ',
                     choices=('nspr', 'nss-util', 'nss-softokn', 'nss'))
 parser.add_argument(
                     '-m', 
@@ -259,7 +260,7 @@ print_debug("%s" % json.dumps(str(buildStatusDict), sort_keys=True, indent=4))
 #NOTE: handle whether or not to copy the files over and create the rpm repo. 
 #The logic is as follows: 
 #if one of the packages failed to build, skipCopy is enalbed, don't copy
-#if the commandline option skipCopy is enalbled, don't copy
+#if the commandline option skipCopy is enabled, don't copy
 #else skipCopy is disabled and the files get copied then the yum repos are created.
 ################################################################################
 skipCopy=False
diff --git a/build_functions.py b/build_functions.py
index 1823d9f..66efc57 100755
--- a/build_functions.py
+++ b/build_functions.py
@@ -379,10 +379,10 @@ def createRepoDirs(mock_cfg, flavor, DT, buildDir, options_test, options_debug,
 
     dashes = "+" + 70 * "-" + "+"
     longDashes = "+" + 80 * "-" + "+"
-    URL="http://mickey.dsdev.sjc.redhat.com"
+    URL="http://pkgs.fedoraproject.org"
     print_debug("URL: %s" % URL)
 #TODO find a better name than repoPackage
-    repoPackage="pki"
+    repoPackage="nss"
     print_debug("repoPackage: %s" % repoPackage)
 
     [platform, rel, arch] = mock_cfg.split("-")
@@ -464,7 +464,7 @@ def createRepoDirs(mock_cfg, flavor, DT, buildDir, options_test, options_debug,
     copyResult = distutils.dir_util.copy_tree(sourceLogDir, targetLogDir, preserve_mode=0, verbose=1)
     print_debug("copyResult %s" %  copyResult)
     #print buildLogs
-    URL="http://mickey.dsdev.sjc.redhat.com"
+    URL="http://pkgs.fedoraproject.org"
     #import json
     test_message = "{test_build}".format(test_build="****this is a TEST BUILD****" if options_test else ".")
     #message_url_path = "{url_path}".format(url_path=os.path.join(URL, repoFull, DT, arch)) if options_test else URL + os.path.join(URL, repoFull, DT, "noarch")
@@ -507,10 +507,10 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti
 
     dashes = "+" + 70 * "-" + "+"
     longDashes = "+" + 80 * "-" + "+"
-    URL="http://mickey.dsdev.sjc.redhat.com"
+    URL="http://pkgs.fedoraproject.org"
     print_debug("URL: %s" % URL)
 #TODO find a better name than repoPackage
-    repoPackage="pki"
+    repoPackage="nss"
     print_debug("repoPackage: %s" % repoPackage)
 
     [platform, rel, arch] = mock_cfg.split("-")
@@ -548,7 +548,7 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti
         repoBase=os.path.join(repos, repoPackage, flavorName, flavorGroup)
         repoFull=os.path.join(repoBase, dist)
     else:
-        flavorName="IPA"
+        flavorName="NSPR"
         flavorGroup="devel"
         flavorName=flavorName.lower()
         repoBase=os.path.join(repos, repoPackage, flavorName, flavorGroup)
@@ -567,9 +567,9 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti
                 print line,
 
 
-    #check for case when a new dist is released and create the dir
+    # check for case when a new dist is released and create the dir
     #################################################################
-    #create the repo tree 
+    # create the repo tree 
     #################################################################
     if os.path.exists(repoBase) and not os.path.exists(repoFull):
         print "INFO: Creating dir", repoFull
@@ -613,10 +613,6 @@ def copyToRepo(mock_cfg, flavor, DT, buildDir, options_test, options_debug, opti
     #################################################################
     #copy the builds over to the newly created repo tree
     #################################################################
-#TODO add some logic for the case where the only build is a noarch and 
-# there are no arch build (dogtag-pki)
-#currently, this creates an empty log file for fileList_i686
-#  /tmp/repos/pki/dogtag/10/F17/20120913-150042/i686/logs/fileList_i686
 
     rpmsDir = os.path.join(buildDir,  "packages/RPMS/" + mock_cfg)
     print dashes
-- 
cgit