From: Marcin Krol Date: Sat, 20 Mar 2021 21:39:40 +0000 (+0100) Subject: - adjusted options for rpm.org RPM X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=cba773a52b76f3c4e47666bc9674978f3e02ab8b;p=tld-builder.git - adjusted options for rpm.org RPM --- diff --git a/TLD_Builder/install.py b/TLD_Builder/install.py index 0131e19..f08a6b4 100644 --- a/TLD_Builder/install.py +++ b/TLD_Builder/install.py @@ -102,7 +102,7 @@ def uninstall(conflicting, b): def uninstall_self_conflict(b): b.log_line("checking BuildConflict-ing packages") f = chroot.popen("set -e; TMPDIR=%(tmpdir)s " \ - "rpmbuild -bp --nobuild --short-circuit --define 'prep exit 0' %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % { + "rpmbuild -br --nobuild %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % { 'tmpdir': b.tmpdir(), 'rpmdefs' : b.rpmbuild_opts(), 'topdir' : b.get_topdir(), @@ -129,7 +129,7 @@ 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" % { + cmd = "set -e; TMPDIR=%(tmpdir)s rpmbuild -br --nobuild %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % { 'tmpdir': tmpdir, 'topdir' : b.get_topdir(), 'rpmdefs' : b.rpmbuild_opts(),