From 8bc23e6ed36a435cfbab927c64487115efa33bf2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 4 May 2012 10:56:29 -0400 Subject: better support for re-reading packages.conf (and SimpleConfigs in general) --- src/lib/Server/Plugins/Packages/PackagesSources.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/lib/Server/Plugins/Packages/PackagesSources.py') diff --git a/src/lib/Server/Plugins/Packages/PackagesSources.py b/src/lib/Server/Plugins/Packages/PackagesSources.py index da79c00e9..e03303d30 100644 --- a/src/lib/Server/Plugins/Packages/PackagesSources.py +++ b/src/lib/Server/Plugins/Packages/PackagesSources.py @@ -35,7 +35,6 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, (self.cachepath, err)) self.pkg_obj = packages self.parsed = set() - self.loaded = False def toggle_debug(self): Bcfg2.Server.Plugin.Debuggable.toggle_debug(self) @@ -47,10 +46,13 @@ class PackagesSources(Bcfg2.Server.Plugin.SingleXMLFileBacked, if event.filename != self.name: self.parsed.add(os.path.basename(event.filename)) - if sorted(list(self.parsed)) == sorted(self.extras): + if self.config.loaded and self.loaded: self.logger.info("Reloading Packages plugin") self.pkg_obj.Reload() - self.loaded = True + + @property + def loaded(self): + return sorted(list(self.parsed)) == sorted(self.extras) def Index(self): Bcfg2.Server.Plugin.SingleXMLFileBacked.Index(self) -- cgit v1.2.3-1-g7c22