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

Merge pull request #34582 from Azidburn/fix-pkg-fromrepo

Browse Source 
fix for mod_aggregate in pkg.py (state module), if fromrepo is used
This commit is contained in:
Mike Place 2016-07-18 07:05:23 -06:00 committed by GitHub
commit 993b217ce1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/states/pkg.py
View File

@ -2493,6 +2493,9 @@ def mod_aggregate(low, chunks, running):
# Check for the same function
if chunk.get('fun') != low.get('fun'):
continue
# Check for the same repo
if chunk.get('fromrepo') != low.get('fromrepo'):
continue
# Pull out the pkg names!
if 'pkgs' in chunk:
pkgs.extend(chunk['pkgs'])