add support for fnmatch() style apt filenames

You can write a apt action like "- apt: pkg=apt*" with this package.
pull/3823/head
Michael Vogt 11 years ago
parent 11fe4566f8
commit 5c39c659e5

@ -29,7 +29,7 @@ version_added: "0.0.2"
options: options:
pkg: pkg:
description: description:
- A package name or package specifier with version, like C(foo) or C(foo=1.0) - A package name or package specifier with version, like C(foo) or C(foo=1.0). Shell like wildcards (fnmatch) like apt* are also supported.
required: false required: false
default: null default: null
state: state:
@ -169,8 +169,30 @@ def package_status(m, pkgname, version, cache, state):
#assume older version of python-apt is installed #assume older version of python-apt is installed
return pkg.isInstalled, pkg.isUpgradable, has_files return pkg.isInstalled, pkg.isUpgradable, has_files
def expand_pkgspec_from_fnmatches(m, pkgspec, cache):
new_pkgspec = []
for pkgname_or_fnmatch_pattern in pkgspec:
# note that any of these chars is not allowed in a (debian) pkgname
if [c for c in pkgname_or_fnmatch_pattern if c in "*?[]!"]:
if "=" in pkgname_or_fnmatch_pattern:
m.fail_json(msg="pkgname wildcard and version can not be mixed")
# handle multiarch pkgnames, the idea is that "apt*" should
# only select native packages. But "apt*:i386" should still work
if not ":" in pkgname_or_fnmatch_pattern:
matches = fnmatch.filter(
[pkg.name for pkg in cache
if not ":" in pkg.name], pkgname_or_fnmatch_pattern)
else:
matches = fnmatch.filter(
[pkg.name for pkg in cache], pkgname_or_fnmatch_pattern)
new_pkgspec.extend(matches)
else:
new_pkgspec.append(pkgname_or_fnmatch_pattern)
return new_pkgspec
def install(m, pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False): def install(m, pkgspec, cache, upgrade=False, default_release=None, install_recommends=True, force=False):
packages = "" packages = ""
pkgspec = expand_pkgspec_from_fnmatches(m, pkgspec, cache)
for package in pkgspec: for package in pkgspec:
name, version = package_split(package) name, version = package_split(package)
installed, upgradable, has_files = package_status(m, name, version, cache, state='install') installed, upgradable, has_files = package_status(m, name, version, cache, state='install')

Loading…
Cancel
Save