]> git.pld-linux.org Git - projects/pld-builder.new.git/commitdiff
Drop a TODO for rpm4 migration
authorJan Rękorajski <baggins@pld-linux.org>
Tue, 19 Jan 2021 23:35:16 +0000 (00:35 +0100)
committerJan Rękorajski <baggins@pld-linux.org>
Tue, 19 Jan 2021 23:35:16 +0000 (00:35 +0100)
PLD_Builder/install.py

index da3ba05d72073ff3f4c2b4c862a6be83796abebe..db16785e3fcb509bc2f9e5bea2a12255e3c3d3eb 100644 (file)
@@ -132,7 +132,11 @@ def install_br(r, b):
         ignore_br = re.compile(r'^\s*(rpmlib|cpuinfo|getconf|uname|soname|user|group|mounted|diskspace|digest|gnupg|macro|envvar|running|sanitycheck|vcheck|signature|verify|exists|executable|readable|writable)\(.*')
 
         tmpdir = b.tmpdir()
-        cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild --nobuild %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
+        rpmcommand = "rpmbuild --nobuild"
+        # TODO: detect rpm version and use the below for rpm 4.x
+        # rpmcommand = "rpmbuild --nobuild -br"
+        cmd = "set -e; TMPDIR=%(tmpdir)s %(rpmcommand) %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
+            'rpmcommand': rpmcommand,
             'tmpdir': tmpdir,
             'topdir' : b.get_topdir(),
             'rpmdefs' : b.rpmbuild_opts(),
This page took 0.088776 seconds and 4 git commands to generate.