moved some libraries in Bcfg2/ into more specific (Server/ or Client/) places

1 files changed, 6 insertions, 5 deletions

diff --git a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
index 169dcd588..ca7b7c530 100644
--- a/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
+++ b/src/lib/Bcfg2/Server/Plugins/Packages/__init__.py
@@ -13,6 +13,7 @@ from Bcfg2.Compat import ConfigParser, urlopen, HTTPError
 from Bcfg2.Server.Plugins.Packages.Collection import Collection, \
     get_collection_class
 from Bcfg2.Server.Plugins.Packages.PackagesSources import PackagesSources
+from Bcfg2.Server.Statistics import track_statistics
 
 #: The default path for generated yum configs
 YUM_CONFIG_DEFAULT = "/etc/yum.repos.d/bcfg2.repo"
@@ -235,7 +236,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
                 return True
         return False
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def validate_structures(self, metadata, structures):
         """ Do the real work of Packages.  This does two things:
 
@@ -270,7 +271,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         collection.build_extra_structures(indep)
         structures.append(indep)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def _build_packages(self, metadata, independent, structures,
                         collection=None):
         """ Perform dependency resolution and build the complete list
@@ -341,7 +342,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         newpkgs.sort()
         collection.packages_to_entry(newpkgs, independent)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Refresh(self):
         """ Packages.Refresh() => True|False
 
@@ -349,7 +350,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
         self._load_config(force_update=True)
         return True
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def Reload(self):
         """ Packages.Refresh() => True|False
 
@@ -445,7 +446,7 @@ class Packages(Bcfg2.Server.Plugin.Plugin,
             if kfile not in keyfiles:
                 os.unlink(kfile)
 
-    @Bcfg2.Server.Plugin.track_statistics()
+    @track_statistics()
     def get_collection(self, metadata):
         """ Get a
         :class:`Bcfg2.Server.Plugins.Packages.Collection.Collection`