From 1ab5df5b1ed6b6082ba453677450bb1b177fcfc0 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 26 Mar 2013 17:19:45 -0400
Subject: fixed regex errors introduced by
 6c996f42c53a36fc0406f836d64b8c1bec6f4bcc

---
 src/lib/Bcfg2/Server/Plugins/Cfg/__init__.py | 4 ++--
 src/lib/Bcfg2/Server/Plugins/Probes.py       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/lib/Bcfg2/Server/Plugins')

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>.*)$')
-- 
cgit v1.2.3-1-g7c22