[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.1.1-1-10-g9e079db

[Iustin Pop]

The following commit has been merged in the master branch:
commit 0de158821301cc1ed8a73fae6ec0c7183f0b0370
Author: Iustin Pop <iustin at debian.org>
Date:   Sun May 23 22:16:56 2010 +0200

    Removed watcher hooks patch (imported upstream)

diff --git a/debian/patches/fix-watcher-hooks-warning.patch b/debian/patches/fix-watcher-hooks-warning.patch
deleted file mode 100644
index 8fdfeaa..0000000
--- a/debian/patches/fix-watcher-hooks-warning.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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 37cb22e..62f588b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
-fix-watcher-hooks-warning.patch

-- 
Ganeti packaging