From db29a7c5e8d8f4361d11df895ee5b34e2c21ae54 Mon Sep 17 00:00:00 2001 From: Sol Jerome Date: Tue, 19 Mar 2013 09:43:07 -0500 Subject: Admin/Init: Fix traceback due to missing import Signed-off-by: Sol Jerome --- src/lib/Bcfg2/Server/Admin/Init.py | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 3e642ee49..613a76649 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -299,6 +299,7 @@ class Init(Bcfg2.Server.Admin.Mode): """Initialize each plugin-specific portion of the repository.""" for plugin in self.plugins: if plugin == 'Metadata': + import Bcfg2.Server.Plugins.Metadata Bcfg2.Server.Plugins.Metadata.Metadata.init_repo( self.data['repopath'], groups_xml=GROUPS % self.data['os_sel'], -- cgit v1.2.3-1-g7c22 From feef09953d2443d7d4d59cbf81d442380bea02ab Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Tue, 19 Mar 2013 14:13:59 -0400 Subject: fixed some pylint errors --- src/lib/Bcfg2/Server/Admin/Init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py index 613a76649..4b8d65597 100644 --- a/src/lib/Bcfg2/Server/Admin/Init.py +++ b/src/lib/Bcfg2/Server/Admin/Init.py @@ -13,6 +13,7 @@ import subprocess import Bcfg2.Server.Admin import Bcfg2.Server.Plugin import Bcfg2.Options +import Bcfg2.Server.Plugins.Metadata from Bcfg2.Compat import input # pylint: disable=W0622 # default config file @@ -299,7 +300,6 @@ class Init(Bcfg2.Server.Admin.Mode): """Initialize each plugin-specific portion of the repository.""" for plugin in self.plugins: if plugin == 'Metadata': - import Bcfg2.Server.Plugins.Metadata Bcfg2.Server.Plugins.Metadata.Metadata.init_repo( self.data['repopath'], groups_xml=GROUPS % self.data['os_sel'], -- cgit v1.2.3-1-g7c22 From 62fe861b93d08077ed2467855f95bf2c437f003b Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 20 Mar 2013 14:03:40 -0400 Subject: Inotify: produce better error when watching non-existent directory or file in such --- src/lib/Bcfg2/Server/FileMonitor/Inotify.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py index 178a47b1a..b44ff6970 100644 --- a/src/lib/Bcfg2/Server/FileMonitor/Inotify.py +++ b/src/lib/Bcfg2/Server/FileMonitor/Inotify.py @@ -2,6 +2,7 @@ support. """ import os +import errno import logging import pyinotify from Bcfg2.Compat import reduce # pylint: disable=W0622 @@ -182,6 +183,9 @@ class Inotify(Pseudo, pyinotify.ProcessEvent): try: watchdir = self.watches_by_path[watch_path] except KeyError: + if not os.path.exists(watch_path): + raise OSError(errno.ENOENT, + "No such file or directory: '%s'" % path) watchdir = self.watchmgr.add_watch(watch_path, self.mask, quiet=False)[watch_path] self.watches_by_path[watch_path] = watchdir -- cgit v1.2.3-1-g7c22