Merge branch 'master' of git.mcs.anl.gov:bcfg2

1 files changed, 45 insertions, 18 deletions

diff --git a/src/lib/Server/Plugins/Cfg.py b/src/lib/Server/Plugins/Cfg.py
index f851b7914..41cf6c9c1 100644
--- a/src/lib/Server/Plugins/Cfg.py
+++ b/src/lib/Server/Plugins/Cfg.py
@@ -6,6 +6,7 @@ import logging
 import lxml
 import os
 import re
+import sys
 import tempfile
 
 import Bcfg2.Server.Plugin
@@ -13,15 +14,21 @@ import Bcfg2.Server.Plugin
 try:
     import genshi.core
     import genshi.input
-    from genshi.template import TemplateLoader, \
-                                TextTemplate, MarkupTemplate, TemplateError
-    from genshi.template import NewTextTemplate
+    from genshi.template import TemplateLoader, NewTextTemplate
     have_genshi = True
 except:
     have_genshi = False
 
 logger = logging.getLogger('Bcfg2.Plugins.Cfg')
 
+
+def u_str(string, encoding):
+    if sys.hexversion >= 0x03000000:
+        return str(string, encoding)
+    else:
+        return unicode(string, encoding)
+
+
 # snipped from TGenshi
 def removecomment(stream):
     """A genshi filter that removes comments from the stream."""
@@ -30,6 +37,7 @@ def removecomment(stream):
             continue
         yield kind, data, pos
 
+
 def process_delta(data, delta):
     if not delta.specific.delta:
         return data
@@ -60,13 +68,15 @@ def process_delta(data, delta):
         output = open(basefile.name, 'r').read()
         [os.unlink(fname) for fname in [basefile.name, dfile.name]]
         if ret >> 8 != 0:
-            raise Bcfg2.Server.Plugin.PluginExecutionError, ('delta', delta)
+            raise Bcfg2.Server.Plugin.PluginExecutionError('delta', delta)
         return output
 
+
 class CfgMatcher:
+
     def __init__(self, fname):
         name = re.escape(fname)
-        self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|.G(?P<prio>\d+)_(?P<group>\S+))(?P<genshi>\\.genshi)?$' % name)
+        self.basefile_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+?)|.G(?P<prio>\d+)_(?P<group>\S+?))(?P<genshi>\\.genshi)?$' % name)
         self.delta_reg = re.compile('^(?P<basename>%s)(|\\.H_(?P<hostname>\S+)|\\.G(?P<prio>\d+)_(?P<group>\S+))\\.(?P<delta>(cat|diff))$' % name)
         self.cat_count = fname.count(".cat")
         self.diff_count = fname.count(".diff")
@@ -77,7 +87,9 @@ class CfgMatcher:
             return self.delta_reg.match(fname)
         return self.basefile_reg.match(fname)
 
+
 class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
+
     def __init__(self, basename, path, entry_type, encoding):
         Bcfg2.Server.Plugin.EntrySet.__init__(self, basename, path,
                                               entry_type, encoding)
@@ -87,15 +99,18 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
         return cmp(one.specific, other.specific)
 
     def get_pertinent_entries(self, metadata):
-        '''return a list of all entries pertinent to a client => [base, delta1, delta2]'''
-        matching = [ent for ent in self.entries.values() if \
+        """return a list of all entries pertinent
+        to a client => [base, delta1, delta2]
+        """
+        matching = [ent for ent in list(self.entries.values()) if \
                     ent.specific.matches(metadata)]
         matching.sort(self.sort_by_specific)
-        non_delta = [matching.index(m) for m in matching if not m.specific.delta]
+        non_delta = [matching.index(m) for m in matching
+                     if not m.specific.delta]
         if not non_delta:
             raise Bcfg2.Server.Plugin.PluginExecutionError
         base = min(non_delta)
-        used = matching[:base+1]
+        used = matching[:base + 1]
         used.reverse()
         return used
 
@@ -113,17 +128,19 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
                 template_cls = NewTextTemplate
                 loader = TemplateLoader()
                 template = loader.load(basefile.name, cls=template_cls,
-                                            encoding=self.encoding)
-                stream = template.generate( \
-                    name=entry.get('name'), metadata=metadata,
-                    path=basefile.name).filter(removecomment)
+                                       encoding=self.encoding)
+                fname = entry.get('realname', entry.get('name'))
+                stream = template.generate(name=fname,
+                                           metadata=metadata,
+                                           path=basefile.name).filter(removecomment)
                 try:
                     data = stream.render('text', strip_whitespace=False)
                 except TypeError:
                     data = stream.render('text')
                 if data == '':
                     entry.set('empty', 'true')
-            except Exception, e:
+            except Exception:
+                e = sys.exc_info()[1]
                 logger.error("Cfg: genshi exception: %s" % e)
                 raise Bcfg2.Server.Plugin.PluginExecutionError
         else:
@@ -136,7 +153,13 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
         if entry.get('encoding') == 'base64':
             entry.text = binascii.b2a_base64(data)
         else:
-            entry.text = unicode(data, self.encoding)
+            try:
+                entry.text = u_str(data, self.encoding)
+            except UnicodeDecodeError:
+                e = sys.exc_info()[1]
+                logger.error("Failed to decode %s: %s" % (entry.get('name'), e))
+                logger.error("Please verify you are using the proper encoding.")
+                raise Bcfg2.Server.Plugin.PluginExecutionError
         if entry.text in ['', None]:
             entry.set('empty', 'true')
 
@@ -168,7 +191,8 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
             open(name, 'w').write(new_entry['text'])
             if log:
                 logger.info("Wrote file %s" % name)
-        badattr = [attr for attr in ['owner', 'group', 'perms'] if attr in new_entry]
+        badattr = [attr for attr in ['owner', 'group', 'perms']
+                   if attr in new_entry]
         if badattr:
             metadata_updates = {}
             metadata_updates.update(self.metadata)
@@ -178,12 +202,13 @@ class CfgEntrySet(Bcfg2.Server.Plugin.EntrySet):
             infotag = lxml.etree.SubElement(infoxml, 'Info')
             [infotag.attrib.__setitem__(attr, metadata_updates[attr]) \
                 for attr in metadata_updates]
-            ofile = open(self.path + "/info.xml","w")
+            ofile = open(self.path + "/info.xml", "w")
             ofile.write(lxml.etree.tostring(infoxml, pretty_print=True))
             ofile.close()
             if log:
                 logger.info("Wrote file %s" % (self.path + "/info.xml"))
 
+
 class Cfg(Bcfg2.Server.Plugin.GroupSpool,
           Bcfg2.Server.Plugin.PullTarget):
     """This generator in the configuration file repository for Bcfg2."""
@@ -197,4 +222,6 @@ class Cfg(Bcfg2.Server.Plugin.GroupSpool,
         return self.entries[entry.get('name')].list_accept_choices(metadata)
 
     def AcceptPullData(self, specific, new_entry, log):
-        return self.entries[new_entry.get('name')].write_update(specific, new_entry, log)
+        return self.entries[new_entry.get('name')].write_update(specific,
+                                                                new_entry,
+                                                                log)