From 73adb1df505a61c6d0143423519d3a9dc23f129e Mon Sep 17 00:00:00 2001 From: Pablo Ruiz Date: Sat, 20 Jun 2015 21:02:08 +0200 Subject: [PATCH] Fix regular expression so it now matches packages with '.' or '-' at pkg name. --- salt/modules/yumpkg.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/modules/yumpkg.py b/salt/modules/yumpkg.py index 92ce0808351c..a609d14be92f 100644 --- a/salt/modules/yumpkg.py +++ b/salt/modules/yumpkg.py @@ -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 = []