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

Merge pull request #5683 from terminalmage/issue5682

Browse Source 
Normalize version numbers to strings in winrepo
This commit is contained in:
David Boucha 2013-06-21 16:06:45 -07:00
commit d18e92a9b2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
salt/runners/winrepo.py
View File

@ -14,6 +14,7 @@ import salt.output
import salt.utils import salt.utils
import logging import logging
import salt.minion import salt.minion
from salt._compat import string_types
log = logging.getLogger(__name__) log = logging.getLogger(__name__)
@ -41,11 +42,14 @@ def genrepo():
'{0}: {1}'.format(os.path.join(root, name), exc)) '{0}: {1}'.format(os.path.join(root, name), exc))
print 'Failed to compile {0}: {1}'.format(os.path.join(root, name), exc) print 'Failed to compile {0}: {1}'.format(os.path.join(root, name), exc)
if config: if config:
ret.setdefault('repo', {}).update(config)
revmap = {} revmap = {}
for pkgname, versions in config.iteritems(): for pkgname, versions in config.iteritems():
for repodata in versions.values(): for version, repodata in versions.iteritems():
if not isinstance(version, string_types):
config[pkgname][str(version)] = \
config[pkgname].pop(version)
revmap[repodata['full_name']] = pkgname revmap[repodata['full_name']] = pkgname
ret.setdefault('repo', {}).update(config)
ret.setdefault('name_map', {}).update(revmap) ret.setdefault('name_map', {}).update(revmap)
with salt.utils.fopen(os.path.join(repo, winrepo), 'w') as repo: with salt.utils.fopen(os.path.join(repo, winrepo), 'w') as repo:
repo.write(msgpack.dumps(ret)) repo.write(msgpack.dumps(ret))