[projects/pld-builder.new] install: drop the empty-killset special case in close_killset()
arekm
arekm at pld-linux.org
Wed Aug 12 11:45:40 CEST 2026
commit f98592f9105d05a07f39cc38abe6b8cae43d50c2
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Aug 12 09:19:41 2026 +0200
install: drop the empty-killset special case in close_killset()
It returned True where callers expect an error string; an empty dict falls through to "" on its own.
PLD_Builder/install.py | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 6e56a33..c735d97 100644
--- a/PLD_Builder/install.py
+++ b/PLD_Builder/install.py
@@ -21,12 +21,9 @@ def rpm_remove(pkgs, b):
return chroot.run("rpm --allmatches -e %s" % pkgs, logfile = b.logfile, user = "root")
def close_killset(killset):
- k = killset.keys()
- if len(k) == 0:
- return True
rx = re.compile(r'^.* marks (?P<name>[^\s]+?)-[^-]+-[^-]+\s.*$')
errors = ""
- for p in list(k):
+ for p in list(killset):
if p in hold:
del killset[p]
errors += "cannot remove %s because it's crucial\n" % p
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/44916a7a9112928736ec2b65b4fa58a90bc5828c
More information about the pld-cvs-commit
mailing list