Skip to content

Commit

Permalink
Fix eclean: Limit invalid search to 'packages' action
Browse files Browse the repository at this point in the history
Signed-off-by: Siddhanth Rathod <[email protected]>
  • Loading branch information
hyprsyd committed Aug 22, 2023
1 parent a16d0d4 commit b0f506d
Showing 1 changed file with 22 additions and 21 deletions.
43 changes: 22 additions & 21 deletions pym/gentoolkit/eclean/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -619,28 +619,29 @@ def doAction(action, options, exclude={}, output=None):
)
output.set_colors("deprecated")
output.list_pkgs(deprecated)
if invalids and options["clean-invalids"]:
if type(invalids) == list:
printUsage(_error="invalid_paths", unresolved_invalids=invalids)
sys.exit(1)
verb = "were"
if options["pretend"]:
verb = "would be"
if not options["quiet"]:
print()
print(
(
pp.emph(" The following ")
+ red("invalid")
+ pp.emph(" binpkgs were found")
if action in ["packages"]:
if invalids and options["clean-invalids"]:
if type(invalids) == list:
printUsage(_error="invalid_paths", unresolved_invalids=invalids)
sys.exit(1)
verb = "were"
if options["pretend"]:
verb = "would be"
if not options["quiet"]:
print()
print(
(
pp.emph(" The following ")
+ red("invalid")
+ pp.emph(" binpkgs were found")
)
)
)
output.set_colors("invalid")
output.list_pkgs(invalids)
clean_size = cleaner.clean_pkgs(invalids, pkgdir)
output.total("invalid", clean_size, len(invalids), verb, action)
else:
cleaner.clean_pkgs(invalids, pkgdir)
output.set_colors("invalid")
output.list_pkgs(invalids)
clean_size = cleaner.clean_pkgs(invalids, pkgdir)
output.total("invalid", clean_size, len(invalids), verb, action)
else:
cleaner.clean_pkgs(invalids, pkgdir)


def main():
Expand Down

0 comments on commit b0f506d

Please sign in to comment.