cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Decide to allow pkgname and version wildcards so that things like libxml2*=2.9* would work

Browse source
This commit is contained in:
Toshio Kuratomi 2014-11-13 11:28:50 -08:00 committed by Matt Clay
parent 37fa22eb93
commit 1ca1b80fe8
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/ansible/modules/packaging/os/apt.py
View file

@ -231,11 +231,9 @@ def expand_pkgspec_from_fnmatches(m, pkgspec, cache):
new_pkgspec = [] new_pkgspec = []
for pkgspec_pattern in pkgspec: for pkgspec_pattern in pkgspec:
pkgname_pattern, version = package_split(pkgspec_pattern) pkgname_pattern, version = package_split(pkgspec_pattern)
# note that any of these chars is not allowed in a (debian) pkgname
if frozenset('*?[]!').intersection(pkgname_pattern):
if version:
m.fail_json(msg="pkgname wildcard and version can not be mixed")
# note that none of these chars is allowed in a (debian) pkgname
if frozenset('*?[]!').intersection(pkgname_pattern):
# handle multiarch pkgnames, the idea is that "apt*" should # handle multiarch pkgnames, the idea is that "apt*" should
# only select native packages. But "apt*:i386" should still work # only select native packages. But "apt*:i386" should still work
if not ":" in pkgname_pattern: if not ":" in pkgname_pattern: