[projects/pld-builder.new] Drop non rpm.org support.

[arekm]

commit 7a5c0a610061e4626eac03bc44b64cf605cf2e9d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Fri Jan 2 18:26:14 2026 +0100

    Drop non rpm.org support.

 PLD_Builder/install.py | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index e77741a..532d57e 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -99,26 +99,9 @@ def uninstall(conflicting, b):
                 b.log_line("package %s removal failed" % k)
     return True
 
-def is_rpmorg():
-    f = chroot.popen("rpm --version 2>&1", encoding = "utf-8")
-    v = re.compile(r'(RPM version|rpm \(RPM\)) (?P<major>\d)\.(?P<minor>\d+)(\.\d+)?')
-    for l in f:
-        m = v.search(l)
-        if m:
-            major = int(m.group('major'))
-            minor = int(m.group('minor'))
-            if major == 4 and minor > 5:
-                f.close()
-                return True
-    f.close()
-    return False
-
 def uninstall_self_conflict(b):
     b.log_line("checking BuildConflict-ing packages")
-    if is_rpmorg():
-        rpmcommand = "rpmbuild --nobuild -br"
-    else:
-        rpmcommand = "rpmbuild --nobuild"
+    rpmcommand = "rpmbuild --nobuild -br"
     cmd = "set -e; TMPDIR=%(tmpdir)s %(rpmcommand)s %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
         'rpmcommand': rpmcommand,
         'tmpdir': b.tmpdir(),
@@ -149,10 +132,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()
-        if is_rpmorg():
-            rpmcommand = "rpmbuild --nobuild -br"
-        else:
-            rpmcommand = "rpmbuild --nobuild"
+        rpmcommand = "rpmbuild --nobuild -br"
         cmd = "set -e; TMPDIR=%(tmpdir)s %(rpmcommand)s %(rpmdefs)s %(topdir)s/%(spec)s 2>&1" % {
             'rpmcommand': rpmcommand,
             'tmpdir': tmpdir,
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/7a5c0a610061e4626eac03bc44b64cf605cf2e9d