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 #29045 from RealKelsar/develop

Browse Source 
Gentoo new package installation
This commit is contained in:
Mike Place 2015-11-19 12:03:49 -07:00
commit 2ce85f3dd4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/modules/ebuild.py
View File

@ -623,11 +623,11 @@ def install(name=None,
# If no prefix characters were supplied and verstr contains a version, use '=' # If no prefix characters were supplied and verstr contains a version, use '='
if len(verstr) > 0 and verstr[0] != ':' and verstr[0] != '[': if len(verstr) > 0 and verstr[0] != ':' and verstr[0] != '[':
prefix = prefix or '=' prefix = prefix or '='
target = '"{0}{1}-{2}"'.format(prefix, param, verstr) target = '{0}{1}-{2}'.format(prefix, param, verstr)
else: else:
target = '"{0}{1}"'.format(param, verstr) target = '{0}{1}'.format(param, verstr)
else: else:
target = '"{0}"'.format(param) target = '{0}'.format(param)
if '[' in target: if '[' in target:
old = __salt__['portage_config.get_flags_from_package_conf']('use', target[1:-1]) old = __salt__['portage_config.get_flags_from_package_conf']('use', target[1:-1])

2
salt/states/pkg.py
View File

@ -1437,7 +1437,7 @@ def latest(
cmp_func=cmp_func): cmp_func=cmp_func):
targets[pkg] = avail[pkg] targets[pkg] = avail[pkg]
else: else:
if __salt__['portage_config.is_changed_uses'](pkg): if not cur[pkg] or __salt__['portage_config.is_changed_uses'](pkg):
targets[pkg] = avail[pkg] targets[pkg] = avail[pkg]
else: else:
for pkg in desired_pkgs: for pkg in desired_pkgs: