Skip to content

Commit cc0ebaf

Browse files
authored
Merge pull request #175 from getsolus/fix-metadata-mess
2 parents 2efcc17 + 92cf2ab commit cc0ebaf

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

pisi/operations/remove.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,11 @@ def remove(
136136
finally:
137137
ctx.exec_usysconf()
138138

139-
return True
139+
# Prior to 2c63650, this function had no return statement at all on the "complete" codepath.
140+
# 2c63650 added a "return True". Unfortunately, it appears that "False" means "Ask the user for confirmation",
141+
# "True" means "the operation failed", and "None" means "Success". Why? No idea! But removing the return statement
142+
# or returning None fixes #173, so... do what works, I guess.
143+
return None
140144

141145

142146
def remove_orphans(ignore_dep=False, ignore_safety=False):

pisi/operations/upgrade.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,11 @@ def upgrade(packages = [], repo = None):
252252
finally:
253253
ctx.exec_usysconf()
254254

255-
return True
255+
# Prior to 2c63650, this function had no return statement at all on the "complete" codepath.
256+
# 2c63650 added a "return True". Unfortunately, it appears that "False" means "Ask the user for confirmation",
257+
# "True" means "the operation failed", and "None" means "Success". Why? No idea! But removing the return statement
258+
# or returning None fixes #173, so... do what works, I guess.
259+
return None
256260

257261

258262
def plan_upgrade(A, force_replaced=True, replaces=None):

0 commit comments

Comments
 (0)