diff options
| author | Elio Maldonado <emaldona@localhost.localdomain> | 2012-12-30 16:31:31 -0800 |
|---|---|---|
| committer | Elio Maldonado <emaldona@localhost.localdomain> | 2012-12-30 16:31:31 -0800 |
| commit | e240de443780a9fa9c3660ec25b5bd7260bf47d1 (patch) | |
| tree | 2802fd7c86fb089a518b58502aea2fe9320a3ccf | |
| parent | 13cfcc482499ed069a48fc84b3039113a8cfd144 (diff) | |
| download | nssmockbuilds4fedora-e240de443780a9fa9c3660ec25b5bd7260bf47d1.tar.gz nssmockbuilds4fedora-e240de443780a9fa9c3660ec25b5bd7260bf47d1.tar.xz nssmockbuilds4fedora-e240de443780a9fa9c3660ec25b5bd7260bf47d1.zip | |
Make it more like nss
| -rwxr-xr-x | python-scripts/build-nss.py | 4 | ||||
| -rwxr-xr-x | python-scripts/build_functions.py | 34 |
2 files changed, 19 insertions, 19 deletions
diff --git a/python-scripts/build-nss.py b/python-scripts/build-nss.py index 77c4907..2cc417c 100755 --- a/python-scripts/build-nss.py +++ b/python-scripts/build-nss.py @@ -47,7 +47,7 @@ parser.add_argument( action="store", dest="rel", default=None, - choices=("6", "7" ), + choices=("rawhide", "f18" ), help='specify a release to use for mock config. [default=None]') parser.add_argument( '-a', @@ -99,7 +99,7 @@ parser.add_argument( action='store', dest='nssPackageList', nargs='+', - default=['nspr', 'nss-util', 'nss-softokn', 'nss', 'certmonger', 'crypto-utils', 'curl', 'mod_nss', 'mod_revocator' ], + default=['nspr', 'nss-util', 'nss-softokn', 'nss' ], help='specify a list of one of more builds to performm. ', choices=('nspr', 'nss-util', 'nss-softokn', 'nss')) parser.add_argument( diff --git a/python-scripts/build_functions.py b/python-scripts/build_functions.py index 9384c12..1823d9f 100755 --- a/python-scripts/build_functions.py +++ b/python-scripts/build_functions.py @@ -190,24 +190,24 @@ def build_package(package, mock_cfg, gitrev, buildDir, group, options_debug, mai scriptsDir = workbase + "/scripts" - if not re.search(YEAR, SRPM): - print "INFO: we need to redo this src.rpm file." - os.chdir(SRPMS) - print_debug("SRPM = %s, gitrev = %s" % (SRPM, gitrev)) - os.listdir(SRPMS) - script = "/srpm_timestamp.sh" - scriptPath = scriptsDir + script +# if not re.search(YEAR, SRPM): +# print "INFO: we need to redo this src.rpm file." +# os.chdir(SRPMS) +# print_debug("SRPM = %s, gitrev = %s" % (SRPM, gitrev)) +# os.listdir(SRPMS) +# script = "/srpm_timestamp.sh" +# scriptPath = scriptsDir + script - #for line in runProcess(['/home/kwright/scripts/srpm_timestamp.sh', SRPM, gitrev]): - 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" + #for line in runProcess(['/home/kwright/scripts/srpm_timestamp.sh', SRPM, gitrev]): +# 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" #resultsDir= '/var/lib/mock/' + mock_cfg + '/result' resultsDir= os.path.join('/var/lib/mock', mock_cfg, 'result') |