From: Peter Palfrader <peter@palfrader.org>
Date: Tue, 9 Dec 2014 20:47:56 +0000 (+0100)
Subject: Fix regex in bacula-backup-dirs
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=7b6d99f3ac32332fc2e44f7d306e595d7a01c6c5;p=mirror%2Fdsa-puppet.git

Fix regex in bacula-backup-dirs
---

diff --git a/modules/bacula/files/bacula-backup-dirs b/modules/bacula/files/bacula-backup-dirs
index bff45a5f0..f63ddef70 100644
--- a/modules/bacula/files/bacula-backup-dirs
+++ b/modules/bacula/files/bacula-backup-dirs
@@ -2,7 +2,7 @@
 
 import re
 
-MI_RE = re.compile(r'(?P<mountid>\d+) (?P<parentid>\d+) (?P<majorminor>\d+:\d+) (?P<root>\S+) (?P<mountpoint>\S+) (?P<options>\S+) (?P<optional>(?:\S+\s)+ )?- (?P<fstype>\S+) (?P<mountsrc>\S+) (?P<superopts>\S+)')
+MI_RE = re.compile(r'(?P<mountid>\d+) (?P<parentid>\d+) (?P<majorminor>\d+:\d+) (?P<root>\S+) (?P<mountpoint>\S+) (?P<options>\S+) (?P<optional>(?:\S+\s)+)?- (?P<fstype>\S+) (?P<mountsrc>\S+) (?P<superopts>\S+)')
 
 for line in file("/proc/self/mountinfo"):
     mi = MI_RE.match(line)