Skip to content

Commit 76801ea

Browse files
dol-senthesamesam
authored andcommitted
eclean: Fix broken deprecated output
Fixes commit: b903e39 which failed to update the deprecated dictionary to the structure updated that output.list_pks() was expecting. Update docstring parameter rename. Signed-off-by: Brian Dolbec <[email protected]> Signed-off-by: Sam James <[email protected]>
1 parent 0bcc75b commit 76801ea

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

pym/gentoolkit/eclean/output.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def total(self, mode, size, num_files, verb, action):
203203
def list_pkgs(self, loc_pkgs):
204204
"""outputs the packages to stdout
205205
206-
@param pkgs: dict. of {location: {cat/pkg-ver: src_uri,} }
206+
@param loc_pkgs: dict. of {location: {cat/pkg-ver: src_uri,} }
207207
"""
208208
indent = " " * 12
209209
for pkgs in loc_pkgs.values():

pym/gentoolkit/eclean/search.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,8 @@ def findDistfiles(
132132
if (not destructive) or fetch_restricted:
133133
self.output("...non-destructive type search")
134134
pkgs, _deprecated = self._non_destructive(destructive, fetch_restricted)
135-
deprecated.update(_deprecated)
135+
# simulate the same structure as invalid binpkgs for list_pkgs()
136+
deprecated.update({_distdir: _deprecated})
136137
installed_included = True
137138
if destructive:
138139
self.output(
@@ -141,7 +142,8 @@ def findDistfiles(
141142
pkgs, _deprecated = self._destructive(
142143
package_names, exclude, pkgs, installed_included
143144
)
144-
deprecated.update(_deprecated)
145+
# simulate the same structure as invalid binpkgs for list_pkgs()
146+
deprecated.update({_distdir: _deprecated)
145147
# gather the files to be cleaned
146148
self.output("...checking limits for %d ebuild sources" % len(pkgs))
147149

0 commit comments

Comments
 (0)