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

Merge pull request #13775 from lyft/channel-support-for-pecl

Browse Source 
Add channel support to pecl module and state
This commit is contained in:
Thomas S Hatch 2014-06-26 19:42:10 -06:00
commit 91b51f4581
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
salt/modules/pecl.py
View File

@ -68,14 +68,26 @@ def install(pecls, defaults=False, force=False, preferred_state='stable'):
defaults=defaults)
else:
_pecl('{0} install {1}'.format(preferred_state, pecls),
defaults=defaults)
installed_pecls = list_()
for pecl in installed_pecls:
installed_pecl_with_version = '{0}-{1}'.format(pecl,
installed_pecls.get(pecl)[0])
if pecls in installed_pecl_with_version:
return True
return False
defaults=defaults)
if not isinstance(pecls, list):
pecls = [pecls]
for pecl in pecls:
found = False
if '/' in pecl:
channel, pecl = pecl.split('/')
else:
channel = None
installed_pecls = list_(channel)
for pecl in installed_pecls:
installed_pecl_with_version = '{0}-{1}'.format(
pecl,
installed_pecls.get(pecl)[0]
)
if pecl in installed_pecl_with_version:
found = True
if not found:
return False
return True
def uninstall(pecls):
@ -110,7 +122,7 @@ def update(pecls):
return _pecl('install -U {0}'.format(pecls))
def list_():
def list_(channel=None):
'''
List installed pecl extensions.
@ -121,7 +133,10 @@ def list_():
salt '*' pecl.list
'''
pecls = {}
lines = _pecl('list').splitlines()
command = 'list'
if channel:
command = '{0} -c {1}'.format(command, channel)
lines = _pecl(command).splitlines()
lines.pop(0)
# Only one line if no package installed:
# (no packages installed from channel pecl.php.net)

13
salt/states/pecl.py
View File

@ -68,12 +68,17 @@ def installed(name,
'comment': '',
'changes': {}}
installed_pecls = __salt__['pecl.list']()
if '/' in name:
channel, package = name.split('/')
else:
channel = None
package = name
installed_pecls = __salt__['pecl.list'](channel)
if name in installed_pecls:
if package in installed_pecls:
# The package is only installed if version is absent or matches
if (version is None or version in installed_pecls[name]) \
and preferred_state in installed_pecls[name]:
if (version is None or version in installed_pecls[package]) \
and preferred_state in installed_pecls[package]:
ret['result'] = True
ret['comment'] = ('Pecl extension {0} is already installed.'
.format(name))