release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Build rhpkg maven-build command correctly.

Browse source
This commit is contained in:
Alex Wood 2015-05-05 17:31:16 -04:00
parent 16581a2327
commit d8e81191e6
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/tito/release/distgit.py
View file

@ -395,9 +395,19 @@ class MeadDistGitReleaser(DistGitReleaser):
test=False, auto_accept=False,
prefix="temp_dir=", **kwargs):
# We don't use the builder.maven_args because they include arguments meant to
# deal with local builds
self.maven_args = []
if 'builder_args' in kwargs:
kwargs['builder_args']['local'] = False
if 'mvn_args' in kwargs['builder_args']:
self.maven_args.append(kwargs['builder_args']['maven_args'])
else:
# Generally people aren't going to want to run their tests during
# a build. If they do, they can set maven_args=''
self.maven_args.append("-Dmaven.test.skip")
DistGitReleaser.__init__(self, name, tag, build_dir, config,
user_config, target, releaser_config, no_cleanup, test,
auto_accept, **kwargs)
@ -428,7 +438,7 @@ class MeadDistGitReleaser(DistGitReleaser):
target_param = "--target %s" % build_target
build_cmd = "%s maven-build --nowait --maven-option '%s' %s " % (
self.cli_tool, self.builder.maven_args, target_param)
self.cli_tool, " ".join(self.maven_args), target_param)
if self.dry_run:
self.print_dry_run_warning(build_cmd)