mirror of
https://github.com/valitydev/salt.git
synced 2024-11-07 17:09:03 +00:00
Fix regular expression so it now matches packages with '.' or '-' at pkg name.
This commit is contained in:
parent
2d8148fb4d
commit
73adb1df50
@ -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 = []
|
||||
|
Loading…
Reference in New Issue
Block a user