aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <proyvind@moondrake.org>2016-05-30 18:02:42 +0200
committerPer Øyvind Karlsen <proyvind@moondrake.org>2016-05-30 18:02:42 +0200
commit681e44a9c70a3fe704d81bc33c563243c9c8ad63 (patch)
treea39aaa4d83a7671f0baaa2f0aa05c7dec75d99ff
parent1d80697535027f5d9307616b7d727b72a429b538 (diff)
downloadmgarepo-681e44a9c70a3fe704d81bc33c563243c9c8ad63.tar
mgarepo-681e44a9c70a3fe704d81bc33c563243c9c8ad63.tar.gz
mgarepo-681e44a9c70a3fe704d81bc33c563243c9c8ad63.tar.bz2
mgarepo-681e44a9c70a3fe704d81bc33c563243c9c8ad63.tar.xz
mgarepo-681e44a9c70a3fe704d81bc33c563243c9c8ad63.zip
add support for specifying build stage
-rw-r--r--MgaRepo/commands/buildrpm.py1
-rw-r--r--MgaRepo/rpmutil.py4
2 files changed, 3 insertions, 2 deletions
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: