valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2313 from archtaku/develop

Browse Source 
Tolerate trailing whitespace in package metadata
This commit is contained in:
Thomas S Hatch 2012-10-22 10:47:13 -07:00
commit cb272e94c0
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/pacman.py
View File

@ -36,12 +36,12 @@ def _parse_pkg_meta(path):
if result['retcode'] == 0:
for line in result['stdout'].split('\n'):
if not name:
m = re.match('^Name\s*:\s*(.+)$',line)
m = re.match('^Name\s*:\s*(.+)\s*$',line)
if m:
name = m.group(1)
continue
if not version:
m = re.match('^Version\s*:\s*(.+)$',line)
m = re.match('^Version\s*:\s*(.+)\s*$',line)
if m:
version = m.group(1)
continue