From 681e44a9c70a3fe704d81bc33c563243c9c8ad63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= Date: Mon, 30 May 2016 18:02:42 +0200 Subject: add support for specifying build stage --- MgaRepo/commands/buildrpm.py | 1 + MgaRepo/rpmutil.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'MgaRepo') diff --git a/MgaRepo/commands/buildrpm.py b/MgaRepo/commands/buildrpm.py index b347cc0..fe4adc9 100644 --- a/MgaRepo/commands/buildrpm.py +++ b/MgaRepo/commands/buildrpm.py @@ -10,6 +10,7 @@ Usage: mgarepo buildrpm [OPTIONS] Builds the binary RPM(s) (.rpm) file(s) of a given package. Options: + -bX Build stage option, where X is stage, default is -bb -l Disable rpmlint check of packages built -P USER Define the RPM packager information to USER -q Silent build output diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py index a4f66f4..550e2aa 100644 --- a/MgaRepo/rpmutil.py +++ b/MgaRepo/rpmutil.py @@ -374,7 +374,7 @@ def put_srpm(srpmfile, markrelease=False, striplog=True, branch=None, log="Copying release %s-%s to releases/ directory." % (version, srpm.release)) -def build_rpm(build_cmd="a", +def build_rpm(build_cmd="b", verbose=False, rpmlint=True, packager = "", @@ -407,7 +407,7 @@ def build_rpm(build_cmd="a", rpmdefs.append(("--define", "_build_pkgcheck_set %{_bindir}/rpmlint")) rpmbuild = config.get("helper", "rpmbuild", "rpmbuild") - args = [rpmbuild, "-bb", spec] + args = [rpmbuild, "-b"+build_cmd, spec] for pair in rpmdefs: args.extend(pair) for pair in macros: -- cgit v1.2.1