Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

win_pkg: pkg.refresh_db verbose=True PY3 compatibility fix #47922

Merged
merged 3 commits into from Jun 5, 2018
Merged

win_pkg: pkg.refresh_db verbose=True PY3 compatibility fix #47922

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ce0fe6
win_pkg under py3 keys returns a view instead of a list, wrap keys in…
damon-atkins Jun 1, 2018
6253793
Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
damon-atkins Jun 3, 2018
7129203
Merge branch '2017.7' into 2017.7_win_pkg_keys_fix
damon-atkins Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion salt/modules/win_pkg.py
View file
Open in desktop
Expand Up @@ -949,7 +949,7 @@ def _failed_compile(prefix_msg, error_msg):
else:
ret.setdefault('repo', {}).update(config)
ret.setdefault('name_map', {}).update(revmap)
successful_verbose[short_path_name] = config.keys()
successful_verbose[short_path_name] = list(config.keys())
elif config:
return _failed_compile('Compiled contents', 'not a dictionary/hash')
else:
Expand Down