[projects/pld-builder.new] Drop a TODO for rpm4 migration
baggins
baggins at pld-linux.org
Wed Jan 20 00:35:49 CET 2021
commit f05867b3eb0b8c820b6998cda6dace5f78e2467c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Wed Jan 20 00:35:16 2021 +0100
Drop a TODO for rpm4 migration
PLD_Builder/install.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index da3ba05..db16785 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -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(),
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/f05867b3eb0b8c820b6998cda6dace5f78e2467c
More information about the pld-cvs-commit
mailing list