aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <proyvind@moondrake.org>2016-07-22 12:57:46 +0200
committerPer Øyvind Karlsen <proyvind@moondrake.org>2016-07-22 12:57:46 +0200
commit0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8 (patch)
tree4babbe603f0f8b41c0de9a7c4c878d7ce3bcfc7d
parent0f6942a6eeadaa125989154cdf86eb15eb9cb41b (diff)
downloadmgarepo-0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8.tar
mgarepo-0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8.tar.gz
mgarepo-0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8.tar.bz2
mgarepo-0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8.tar.xz
mgarepo-0a73d29e43cc2cddb6de0a403bcb5480e4fd36b8.zip
enable source fetching right away
as 'rpmbuild --nobuild' will fail immediately if sources are missing, rather than the traditional behaviour proceeding with checking dependencies and only fail in case something fails during build due to missing sources
-rw-r--r--MgaRepo/rpmutil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/MgaRepo/rpmutil.py b/MgaRepo/rpmutil.py
index ebbe5b7..c9a87b1 100644
--- a/MgaRepo/rpmutil.py
+++ b/MgaRepo/rpmutil.py
@@ -439,6 +439,7 @@ def build_rpm(build_cmd="b",
args.extend(pair)
for pair in macros:
args.extend(("--define", "%s %s" % pair))
+ args.extend(("--define", "_disable_source_fetch 0"))
args.extend(*rpmargs.values())
os.environ["LC_ALL"] = "C"
# First check whether dependencies are satisfied
@@ -470,7 +471,6 @@ def build_rpm(build_cmd="b",
cmd = cmd_base + [spec]
status, output = execcmd(*cmd, show=verbose, collecter=True, noerror=True)
- args.extend(("--define", "_disable_source_fetch 0"))
status, output = execcmd(*args + ["-b"+build_cmd], show=verbose)
if svnlog:
if os.path.isdir(specsdir):