diff options
Diffstat (limited to 'fedpkg-pull-build-chain')
| -rwxr-xr-x | fedpkg-pull-build-chain | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/fedpkg-pull-build-chain b/fedpkg-pull-build-chain index 2e3e07c..a12ff4e 100755 --- a/fedpkg-pull-build-chain +++ b/fedpkg-pull-build-chain @@ -44,7 +44,8 @@ class FedpkgPullBuildChainState(dbus.service.Object): def main(): try: - opts, args = getopt.getopt(sys.argv[1:], '', ['release=', 'arch=', 'resultdir=', 'delete-old', 'force']) + opts, args = getopt.getopt(sys.argv[1:], '', ['release=', 'spec-release=', + 'arch=', 'resultdir=', 'delete-old', 'force']) except getopt.GetoptError, e: print unicode(e) print "Usage: fedpkg-pull-build-chain --release=F-12 --resultdir=/path/to/repo rpm1 rpm2 ..." @@ -53,6 +54,7 @@ def main(): force = False delete_old = False release = None + spec_release = 'devel' resultdir = None architectures = [] for o, a in opts: @@ -60,6 +62,8 @@ def main(): force = True elif o in ('--release', ): release = a + elif o in ('--spec-release', ): + spec_release = a elif o in ('--arch', ): architectures.append(a) elif o in ('--resultdir', ): @@ -132,8 +136,8 @@ def main(): if not os.path.isdir(arg): print "Checking out %r from fedora-cvs" % (arg, ) notify_state('fedora-vcs', { 'module': arg }) - check_call_verbose(['fedora-cvs', arg], stdout=sys.stdout, stderr=sys.stderr) - release_dir = os.path.join(arg, release) + check_call_verbose(['fedora-cvs', '-a', arg], stdout=sys.stdout, stderr=sys.stderr) + release_dir = os.path.join(arg, spec_release) for filename in os.listdir(release_dir): fpath = os.path.join(release_dir, filename) if filename.endswith('.src.rpm'): @@ -190,7 +194,9 @@ def main(): for mockrelease in mockreleases: try: notify_state('build', { 'module': arg, 'srpm': os.path.basename(srpm), 'target': mockrelease }) - check_call_verbose(['mock', '--configdir=' + builddir, '-r', mockrelease, '--resultdir=' + mock_resultdir, 'rebuild', srpm], stdout=sys.stdout, stderr=sys.stderr) + check_call_verbose(['mock', '--configdir=' + builddir, '-r', mockrelease, + '--resultdir=' + mock_resultdir, 'rebuild', srpm], + stdout=sys.stdout, stderr=sys.stderr) except subprocess.CalledProcessError, e: print "Failed: " + unicode(e) current_failed = True |