summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2010-03-09 11:19:51 -0500
committerColin Walters <walters@verbum.org>2010-03-09 11:19:51 -0500
commit3135a84e9baf380cb285989eb057e2d4e9f26e40 (patch)
tree2159feb4994ed2d1ea56d2dd0d872605c1a0a902
parentf3d68d400f5cab374d7ab20a9d527f46ff744556 (diff)
downloadfedpkg-make-pull-3135a84e9baf380cb285989eb057e2d4e9f26e40.tar.gz
fedpkg-make-pull-3135a84e9baf380cb285989eb057e2d4e9f26e40.tar.xz
fedpkg-make-pull-3135a84e9baf380cb285989eb057e2d4e9f26e40.zip
[fedpkg-pull-build-chain] Pass options before args to fedpkg-vcs
Otherwise option processing doesn't work.
-rwxr-xr-xfedpkg-pull-build-chain3
1 files changed, 2 insertions, 1 deletions
diff --git a/fedpkg-pull-build-chain b/fedpkg-pull-build-chain
index f72acff..d95991a 100755
--- a/fedpkg-pull-build-chain
+++ b/fedpkg-pull-build-chain
@@ -149,9 +149,10 @@ def main():
print "Running fedpkg-vcs"
notify_state('upstream-vcs', { 'module': arg })
- args = ['fedpkg-vcs', 'pull-update', '--status-file=' + os.path.abspath('pull-status')]
+ args = ['fedpkg-vcs', '--status-file=' + os.path.abspath('pull-status')]
if force or not last_build_succeeded:
args.append('--force')
+ args.extend(['pull-retarget', 'HEAD'])
try:
check_call_verbose(args, stdout=sys.stdout, stderr=sys.stderr, cwd=release_dir)
except subprocess.CalledProcessError, e: