valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8971 from cvedel/issue_8945

Browse Source 
Fix for issue #8945
This commit is contained in:
Thomas S Hatch 2013-12-03 10:07:15 -08:00
commit f4aafb8eb4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/pkg_resource.py
View File

@ -27,7 +27,8 @@ def _parse_pkg_meta(path):
''' '''
def parse_rpm(path): def parse_rpm(path):
try: try:
import collections # needed by _parse_pkginfo, DO NOT REMOVE global __SUFFIX_NOT_NEEDED # needed by _parse_pkginfo, DO NOT REMOVE
from salt.modules.yumpkg5 import __SUFFIX_NOT_NEEDED
from salt.modules.yumpkg5 import __QUERYFORMAT, _parse_pkginfo from salt.modules.yumpkg5 import __QUERYFORMAT, _parse_pkginfo
from salt.utils import namespaced_function as _namespaced_function from salt.utils import namespaced_function as _namespaced_function
_parse_pkginfo = _namespaced_function(_parse_pkginfo, globals()) _parse_pkginfo = _namespaced_function(_parse_pkginfo, globals())