diff options
author | Jesse Keating <jkeating@redhat.com> | 2010-09-23 13:18:32 +0200 |
---|---|---|
committer | Jesse Keating <jkeating@redhat.com> | 2010-09-23 13:18:32 +0200 |
commit | a335d527e5b7f3f0464b6d0e51b9b73ad533da23 (patch) | |
tree | 781e3f671e317abb78f5e94e208101ddec0be1b7 /src | |
parent | 1350c0d2b3810d30fa97d8084de8ef69a95bba15 (diff) | |
parent | 03c03cebb7bf9bf064a8d14fffde115607af81d5 (diff) | |
download | fedora-packager-a335d527e5b7f3f0464b6d0e51b9b73ad533da23.tar.gz fedora-packager-a335d527e5b7f3f0464b6d0e51b9b73ad533da23.tar.xz fedora-packager-a335d527e5b7f3f0464b6d0e51b9b73ad533da23.zip |
Merge branch 'bashfixes' into jochen
Conflicts:
src/fedpkg.bash
Diffstat (limited to 'src')
-rw-r--r-- | src/fedpkg.bash | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fedpkg.bash b/src/fedpkg.bash index 41181a0..117bd23 100644 --- a/src/fedpkg.bash +++ b/src/fedpkg.bash @@ -87,14 +87,14 @@ _fedpkg() # parse command specific options local options= - local options_target= options_arches= options_branch= options_string= options_file= options_srpm= + local options_target= options_arches= options_branch= options_string= options_file= options_dir= options_srpm= local after= after_more= case $command in help|clog|gimmespec|giturl|lint|mockbuild|new|push|unused-patches|update|verrel) ;; build) - options="--nowait --background --skip-tag --scratch --srpm" + options="--nowait --background --skip-tag --scratch" options_srpm="--srpm" options_target="--target" ;; @@ -152,7 +152,7 @@ _fedpkg() after_more=true ;; scratch-build) - options="--nowait --background --srpm" + options="--nowait --background" options_target="--target" options_arches="--arches" options_srpm="--srpm" @@ -183,7 +183,7 @@ _fedpkg() esac local all_options="--help $options" - local all_options_value="$options_target $options_arches $options_branch $options_string $options_file $options_dir" + local all_options_value="$options_target $options_arches $options_branch $options_string $options_file $options_dir $options_srpm" # count non-option parametrs |