Merge pull request #24852 from pruiz/issue-24851

Fix issue 24851: regular expression so it now matches packages with '.' or '-' at pkg name
saltstack · Jun 22, 2015 · 3902b16 · 3902b16
2 parents 6c5b788 + 73adb1d
commit 3902b16
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 = []