diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 17:19:45 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-03-26 17:19:45 -0400 |
commit | 1ab5df5b1ed6b6082ba453677450bb1b177fcfc0 (patch) | |
tree | d120763b02be939b9e3a0190c5f4920c2d07c9d8 /src/lib/Bcfg2/Server/Plugins | |
parent | f6b458324f0be89f48229d4d1b5f3be9ae047497 (diff) | |
download | bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.tar.gz bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.tar.bz2 bcfg2-1ab5df5b1ed6b6082ba453677450bb1b177fcfc0.zip |
fixed regex errors introduced by 6c996f42c53a36fc0406f836d64b8c1bec6f4bcc
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 4 | ||||
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Probes.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py index ffc26713f..926172e57 100644 --- a/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py +++ b/src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py @@ -111,10 +111,10 @@ class CfgBaseFileMatcher(Bcfg2.Server.Plugin.SpecificData, components = ['^(?P<basename>%s)' % '|'.join(re.escape(b) for b in basenames)] if cls.__specific__: - components.append(r'(|\\.H_(?P<hostname>\S+?)|' + + components.append(r'(|\.H_(?P<hostname>\S+?)|' + r'\.G(?P<prio>\d+)_(?P<group>\S+?))') if cls.__extensions__: - components.append(r'\\.(?P<extension>%s)' % + components.append(r'\.(?P<extension>%s)' % r'|'.join(cls.__extensions__)) components.append(r'$') return re.compile("".join(components)) diff --git a/src/lib/Bcfg2/Server/Plugins/Probes.py b/src/lib/Bcfg2/Server/Plugins/Probes.py index d57eb4228..fa56564fa 100644 --- a/src/lib/Bcfg2/Server/Plugins/Probes.py +++ b/src/lib/Bcfg2/Server/Plugins/Probes.py @@ -111,7 +111,7 @@ class ProbeData(str): class ProbeSet(Bcfg2.Server.Plugin.EntrySet): """ Handle universal and group- and host-specific probe files """ - ignore = re.compile(r'^(\.#.*|.*~|\\..*\\.(tmp|sw[px])|probed\\.xml)$') + ignore = re.compile(r'^(\.#.*|.*~|\..*\.(tmp|sw[px])|probed\.xml)$') probename = \ re.compile(r'(.*/)?(?P<basename>\S+?)(\.(?P<mode>(?:G\d\d)|H)_\S+)?$') bangline = re.compile(r'^#!\s*(?P<interpreter>.*)$') |