Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name #24852

Merged
merged 1 commit into from Jun 22, 2015
Merged

Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name #24852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions salt/modules/yumpkg.py
View file
Open in desktop
Expand Up @@ -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 = []
Expand Down