diff options
Diffstat (limited to 'build_functions.py')
| -rwxr-xr-x | build_functions.py | 20 |
1 files changed, 8 insertions, 12 deletions
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 |