[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.0.6-2-20-g7fef725

[Iustin Pop]

The following commit has been merged in the master branch:
commit f7b2135a3d1eca3190452ef71a730a4bcf554c93
Author: Iustin Pop <iustin at debian.org>
Date:   Sat Apr 17 20:00:44 2010 +0200

    Import watcher warnings patch from upstream

diff --git a/debian/patches/fix-watcher-hooks-warning.patch b/debian/patches/fix-watcher-hooks-warning.patch
new file mode 100644
index 0000000..8fdfeaa
--- /dev/null
+++ b/debian/patches/fix-watcher-hooks-warning.patch
@@ -0,0 +1,27 @@
+From: Iustin Pop <iustin at google.com>
+Date: Mon, 22 Mar 2010 15:15:46 +0000 (+0100)
+Subject: Watcher: do not warn for missing hooks dir
+X-Git-Url: http://git.ganeti.org/?p=ganeti.git;a=commitdiff_plain;h=10e689d4;hp=bbcf7ad022e5b0e8fd247175ef9cb98f1f6ca78f
+
+Watcher: do not warn for missing hooks dir
+
+If the hooks dir does not exist, do not warn needlessly. This is similar
+to commit a9b7e346 (for backend.py).
+
+Signed-off-by: Iustin Pop <iustin at google.com>
+Reviewed-by: René Nussbaumer <rn at google.com>
+---
+
+diff --git a/daemons/ganeti-watcher b/daemons/ganeti-watcher
+index 6bac441..050e789 100755
+--- a/daemons/ganeti-watcher
++++ b/daemons/ganeti-watcher
+@@ -87,6 +87,8 @@ def RunWatcherHooks():
+   """
+   hooks_dir = utils.PathJoin(constants.HOOKS_BASE_DIR,
+                              constants.HOOKS_NAME_WATCHER)
++  if not os.path.isdir(hooks_dir):
++    return
+ 
+   try:
+     results = utils.RunParts(hooks_dir)
diff --git a/debian/patches/series b/debian/patches/series
index 933633c..e900057 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix-startup-with-old-config.patch
 import-cfgupgrade12.patch
 fix-check-man.patch
+fix-watcher-hooks-warning.patch

-- 
Ganeti packaging