saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #24852 from pruiz/issue-24851

Browse source 
Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name
This commit is contained in:
Thomas S Hatch 2015-06-22 16:37:13 -04:00
commit 3902b162a9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/yumpkg.py
View file

@ -1487,9 +1487,9 @@ def get_locked_packages(pattern=None, full=True):
_pat = r'\d\:({0}\-\S+)'.format(pattern)
else:
if full:
_pat = r'(\d\:\w+\-\S+)'
_pat = r'(\d\:\w+(?:[\.\-][^\-]+)*-\S+)'
else:
_pat = r'\d\:(\w+\-\S+)'
_pat = r'\d\:(\w+(?:[\.\-][^\-]+)*-\S+)'
pat = re.compile(_pat)
current_locks = []