[projects/pld-builder.new] install: drop hardcoded dry-run switch in upgrade_from_batch

arekm arekm at pld-linux.org
Wed Aug 12 11:46:21 CEST 2026


commit a6f641bb01beba9988f256a4d7f0a638a2ae6991
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Aug 12 10:13:51 2026 +0200

    install: drop hardcoded dry-run switch in upgrade_from_batch
    
    if True:/else: with the else branch unreachable since 73bdb36 (2008-08-10).

 PLD_Builder/install.py | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 6b0f90f..c733239 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -66,17 +66,13 @@ def upgrade_from_batch(r, b):
         return False
     if killset:
         k = ' '.join(sorted(killset))
-        if True:
-            b.log_line("upgrade requires removal of %s" % k)
-            res = rpm_remove(k, b)
-            if res != 0:
-                b.log_line("package removal failed")
-                return False
-            else:
-                b.log_line("packages removed successfully")
-        else:
-            b.log_line("upgrade would need removal of %s" % k)
+        b.log_line("upgrade requires removal of %s" % k)
+        res = rpm_remove(k, b)
+        if res != 0:
+            b.log_line("package removal failed")
             return False
+        else:
+            b.log_line("packages removed successfully")
     b.log_line("upgrading packages")
     res = chroot.run("rpm -Fvh %s" % ' '.join(b.files), user = "root", logfile = b.logfile)
     if res != 0:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/44916a7a9112928736ec2b65b4fa58a90bc5828c



More information about the pld-cvs-commit mailing list