diff options
| author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-09-28 15:51:09 +0300 |
|---|---|---|
| committer | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2012-09-28 15:53:52 +0300 |
| commit | 354c2c9a4b517d83f47dbf57275ad464224d99d1 (patch) | |
| tree | 10d4c325f70f7c3e7f6d0e18dd0be62f98fc11ba | |
| parent | 4c7387dc27bfdf31f4e21e44903549c618fb1a3d (diff) | |
| download | git-buildpackage-354c2c9a4b517d83f47dbf57275ad464224d99d1.tar.gz git-buildpackage-354c2c9a4b517d83f47dbf57275ad464224d99d1.tar.bz2 git-buildpackage-354c2c9a4b517d83f47dbf57275ad464224d99d1.zip | |
buildpackage-rpm: respect user cmdline options for rpmbuild
Don't force '-ba' when building with rpmbuild - only add '-ba' if the
user gives no options.
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
| -rw-r--r-- | gbp/config.py | 2 | ||||
| -rwxr-xr-x | gbp/scripts/buildpackage_rpm.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/gbp/config.py b/gbp/config.py index e05b4ea9..026c2696 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -459,7 +459,7 @@ class GbpOptionParserRpm(GbpOptionParser): defaults = dict(GbpOptionParser.defaults) defaults.update( { 'vendor' : 'vendor', - 'builder' : 'rpmbuild -ba', + 'builder' : 'rpmbuild', 'cleaner' : '', 'packaging-dir' : '', 'packaging-tag' : '%(vendor)s/%(version)s', diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py index 0b99d238..07dce53d 100755 --- a/gbp/scripts/buildpackage_rpm.py +++ b/gbp/scripts/buildpackage_rpm.py @@ -238,8 +238,9 @@ def is_native(repo, options): def setup_builder(options, builder_args): """setup everything to use git-pbuilder""" if options.builder.startswith('rpmbuild'): - builder_args.extend(['-ba', - '--define "_topdir %s"' % os.path.abspath(options.export_dir), + if len(builder_args) == 0: + builder_args.append('-ba') + builder_args.extend(['--define "_topdir %s"' % os.path.abspath(options.export_dir), '--define "_builddir %%_topdir/%s"' % options.build_dir, '--define "_rpmdir %%_topdir/%s"' % options.rpm_dir, '--define "_sourcedir %%_topdir/%s"' % options.source_dir, |