1 files changed, 13 insertions, 19 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
index 7796b9e34..0d565be31 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/PackagesSources.py
@@ -4,17 +4,15 @@ import lxml.etree
 import Bcfg2.Server.Plugin
 from Bcfg2.Server.Plugins.Packages.Source import SourceInitError
 
-class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
-                      Bcfg2.Server.Plugin.StructFile,
+class PackagesSources(Bcfg2.Server.Plugin.StructFile,
                       Bcfg2.Server.Plugin.Debuggable):
     __identifier__ = None
 
     def __init__(self, filename, cachepath, fam, packages, setup):
         Bcfg2.Server.Plugin.Debuggable.__init__(self)
         try:
-            Bcfg2.Server.Plugin.SingleXMLFileBacked.__init__(self,
-                                                             filename,
-                                                             fam)
+            Bcfg2.Server.Plugin.StructFile.__init__(self, filename, fam=fam,
+                                                    should_monitor=True)
         except OSError:
             err = sys.exc_info()[1]
             msg = "Packages: Failed to read configuration file: %s" % err
@@ -22,7 +20,6 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
                 msg += " Have you created it?"
             self.logger.error(msg)
             raise Bcfg2.Server.Plugin.PluginInitError(msg)
-        Bcfg2.Server.Plugin.StructFile.__init__(self, filename)
         self.cachepath = cachepath
         self.setup = setup
         if not os.path.exists(self.cachepath):
@@ -42,18 +39,11 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
             source.toggle_debug()
 
     def HandleEvent(self, event=None):
-        Bcfg2.Server.Plugin.SingleXMLFileBacked.HandleEvent(self, event=event)
+        Bcfg2.Server.Plugin.XMLFileBacked.HandleEvent(self, event=event)
         if event and event.filename != self.name:
-            for fname in self.extras:
-                fpath = None
-                if fname.startswith("/"):
-                    fpath = os.path.abspath(fname)
-                else:
-                    fpath = \
-                        os.path.abspath(os.path.join(os.path.dirname(self.name),
-                                                                     fname))
+            for fpath in self.extras:
                 if fpath == os.path.abspath(event.filename):
-                    self.parsed.add(fname)
+                    self.parsed.add(fpath)
                     break
 
         if self.loaded:
@@ -65,7 +55,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
         return sorted(list(self.parsed)) == sorted(self.extras)
 
     def Index(self):
-        Bcfg2.Server.Plugin.SingleXMLFileBacked.Index(self)
+        Bcfg2.Server.Plugin.XMLFileBacked.Index(self)
         self.entries = []
         for xsource in self.xdata.findall('.//Source'):
             source = self.source_from_xml(xsource)
@@ -87,7 +77,8 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
                              stype.title())
             cls = getattr(module, "%sSource" % stype.title())
         except (ImportError, AttributeError):
-            self.logger.error("Packages: Unknown source type %s" % stype)
+            ex = sys.exc_info()[1]
+            self.logger.error("Packages: Unknown source type %s (%s)" % (stype, ex))
             return None
 
         try:
@@ -106,4 +97,7 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked,
         return "PackagesSources: %s" % repr(self.entries)
 
     def __str__(self):
-        return "PackagesSources: %s" % str(self.entries)
+        return "PackagesSources: %s sources" % len(self.entries)
+
+    def __len__(self):
+        return len(self.entries)