Skip to content

Commit

Permalink
Merge pull request #25566 from techhat/issue25475
Browse files Browse the repository at this point in the history
Fix download process for SPM repo updates
  • Loading branch information
Nicole Thomas committed Jul 21, 2015
2 parents a836796 + c19fdf1 commit 4696626
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions salt/client/spm.py
Original file line number Diff line number Diff line change
Expand Up @@ -273,10 +273,8 @@ def _update_metadata(repo, repo_info):
with salt.utils.fopen(dl_path, 'r') as rpm:
metadata = yaml.safe_load(rpm)
else:
response = http.query(
'{0}/SPM-METADATA'.format(dl_path),
)
metadata = response.get('dict', {})
response = http.query(dl_path, text=True)
metadata = response.get('text', {})
cache_path = '{0}/{1}.p'.format(
self.opts['spm_cache_dir'],
repo
Expand Down

0 comments on commit 4696626

Please sign in to comment.