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

Fallback to grep-available for virtual pkg support

Browse Source
This commit is contained in:
Erik Johnson 2014-10-14 16:23:43 -05:00
parent 39845d2cd2
commit 06402b6086
1 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
salt/modules/aptpkg.py
View File

@ -4,8 +4,10 @@ Support for APT (Advanced Packaging Tool)
.. note:: .. note::
The ``python-apt`` package is required to be installed. For virtual package support, either the ``python-apt`` or ``dctrl-tools``
package must be installed.
For repository management, the ``python-apt`` package must be installed.
''' '''
# Import python libs # Import python libs
@ -122,21 +124,39 @@ def _get_repo(**kwargs):
return '' return ''
def _has_dpkg_tools():
try:
return __context__['pkg._has_dpkg_tools']
except KeyError:
__context__['pkg._has_dpkg_tools'] = \
__salt__['cmd.has_exec']('grep-available')
return __context__['pkg._has_dpkg_tools']
def _get_virtual(): def _get_virtual():
''' '''
Return a dict of virtual package information Return a dict of virtual package information
''' '''
if 'pkg._get_virtual' not in __context__: try:
return __context__['pkg._get_virtual']
except KeyError:
__context__['pkg._get_virtual'] = {} __context__['pkg._get_virtual'] = {}
apt_cache = apt.cache.Cache() if HAS_APT:
pkgs = getattr(apt_cache._cache, 'packages', []) apt_cache = apt.cache.Cache()
for pkg in pkgs: pkgs = getattr(apt_cache._cache, 'packages', [])
for item in getattr(pkg, 'provides_list', []): for pkg in pkgs:
realpkg = item[2].parent_pkg.name for item in getattr(pkg, 'provides_list', []):
if realpkg not in __context__['pkg._get_virtual']: realpkg = item[2].parent_pkg.name
__context__['pkg._get_virtual'][realpkg] = [] if realpkg not in __context__['pkg._get_virtual']:
__context__['pkg._get_virtual'][realpkg].append(pkg.name) __context__['pkg._get_virtual'][realpkg] = []
return __context__['pkg._get_virtual'] __context__['pkg._get_virtual'][realpkg].append(pkg.name)
elif _has_dpkg_tools():
cmd = 'grep-available -F Provides -s Package,Provides -e "^.+$"'
out = __salt__['cmd.run_stdout'](cmd, output_loglevel='trace')
virtpkg_re = re.compile(r'Package: (\S+)\nProvides: ([\S, ]+)')
for realpkg, provides in virtpkg_re.findall(out):
__context__['pkg._get_virtual'][realpkg] = provides.split(', ')
return __context__['pkg._get_virtual']
def _warn_software_properties(repo): def _warn_software_properties(repo):
@ -197,11 +217,6 @@ def latest_version(*names, **kwargs):
if refresh: if refresh:
refresh_db() refresh_db()
if not HAS_APT:
raise CommandExecutionError(
'Error: \'python-apt\' package not installed'
)
virtpkgs = _get_virtual() virtpkgs = _get_virtual()
all_virt = set() all_virt = set()
for provides in virtpkgs.values(): for provides in virtpkgs.values():
@ -827,10 +842,10 @@ def list_pkgs(versions_as_list=False,
Packages in this state now correctly show up in the output of this Packages in this state now correctly show up in the output of this
function. function.
External dependencies:: .. note:: External dependencies
Virtual package resolution requires dctrl-tools. Without dctrl-tools Virtual package resolution requires the ``dctrl-tools`` package to be
virtual packages will be reported as not installed. installed. Virtual packages will show a version of ``1``.
CLI Example: CLI Example:
@ -888,11 +903,6 @@ def list_pkgs(versions_as_list=False,
name, name,
version_num) version_num)
if not HAS_APT:
raise CommandExecutionError(
'Error: \'python-apt\' package not installed'
)
# Check for virtual packages. We need dctrl-tools for this. # Check for virtual packages. We need dctrl-tools for this.
if not removed: if not removed:
virtpkgs_all = _get_virtual() virtpkgs_all = _get_virtual()
@ -938,7 +948,7 @@ def _get_upgradable():
# Conf libxfont1 (1:1.4.5-1 Debian:testing [i386]) # Conf libxfont1 (1:1.4.5-1 Debian:testing [i386])
rexp = re.compile('(?m)^Conf ' rexp = re.compile('(?m)^Conf '
'([^ ]+) ' # Package name '([^ ]+) ' # Package name
r'\(([^ ]+)') # Version r'\(([^ ]+)') # Version
keys = ['name', 'version'] keys = ['name', 'version']
_get = lambda l, k: l[keys.index(k)] _get = lambda l, k: l[keys.index(k)]