From f55238772edf411cb101f4b179c357fffa665345 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 21 May 2013 13:50:49 -0400
Subject: FileProbes: made client probe compatible with bcfg2 1.2

---
 src/lib/Bcfg2/Server/Plugins/FileProbes.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/Bcfg2/Server/Plugins/FileProbes.py b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
index d816192aa..8e074118f 100644
--- a/src/lib/Bcfg2/Server/Plugins/FileProbes.py
+++ b/src/lib/Bcfg2/Server/Plugins/FileProbes.py
@@ -24,7 +24,11 @@ import sys
 import pwd
 import grp
 import Bcfg2.Client.XML
-from Bcfg2.Compat import b64encode, oct_mode
+try:
+    from Bcfg2.Compat import b64encode, oct_mode
+except ImportError:
+    from base64 import b64encode
+    oct_mode = oct
 
 path = "%s"
 
-- 
cgit v1.2.3-1-g7c22