[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-1-44-g2b8332d

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit 2b8332d566d58f1b250254ec92eacb117e6d582d
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Tue Jul 23 17:56:44 2013 +0300

    Use the logrotate patch merged upstream
    
    But provide our own logrotate snippet (merged upstream), because importing the
    full patch requires a sphinx doc rebuild and a build-dependency on
    python-sphinx.

diff --git a/debian/changelog b/debian/changelog
index 8e3cb78..eb0fec7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,7 @@ ganeti (2.7.0-2) unstable; urgency=low
     - Run the upstream test suite during build
       o Add a patch to disable running `local' checks
   * Provide the /etc/logrotate.d/ganeti snippet
-    - Include a patch forwarded upstream, providing the rotate-all command for
-      /usr/lib/ganeti/daemon-util
+    - Include 1 patch, merged upstream, implementing the logrotate helper.
   * Ship the majority of the Python code in a private module under
     /usr/share/ganeti
   * Ship the RAPI client as a separate package (python-ganeti-rapi)
diff --git a/debian/ganeti.logrotate b/debian/ganeti.logrotate
index a81a7e2..d243907 100644
--- a/debian/ganeti.logrotate
+++ b/debian/ganeti.logrotate
@@ -8,6 +8,6 @@
         create 640 root root
         sharedscripts
         postrotate
-		/usr/lib/ganeti/daemon-util rotate-all
+               /usr/lib/ganeti/daemon-util rotate-all-logs
         endscript
 }
diff --git a/debian/patches/0001-daemon-util-provide-rotate-and-rotate_all-actions.patch b/debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
similarity index 78%
rename from debian/patches/0001-daemon-util-provide-rotate-and-rotate_all-actions.patch
rename to debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
index ce5de22..408dc61 100644
--- a/debian/patches/0001-daemon-util-provide-rotate-and-rotate_all-actions.patch
+++ b/debian/patches/0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch
@@ -1,21 +1,20 @@
-From 92113d5551ef1bacb17aa66b0facda162bec158a Mon Sep 17 00:00:00 2001
+From f99cbfbdfa1ead0f36930ebcd3891c8ae3597fe1 Mon Sep 17 00:00:00 2001
 From: Apollon Oikonomopoulos <apoikos at gmail.com>
-Date: Tue, 23 Jul 2013 13:09:20 +0300
-Subject: [PATCH stable-2.7 1/2] daemon-util: provide rotate and rotate_all
+Date: Tue, 23 Jul 2013 17:21:31 +0300
+Subject: [PATCH 1/2] daemon-util: provide rotate_logs and rotate_all_logs
  actions
 
 Modify daemon-util to allow sending SIGHUP to one or all daemons. This is meant
 as a utility function to be used in logrotate definitions.
 
 Signed-off-by: Apollon Oikonomopoulos <apoikos at gmail.com>
-Forwarded: yes
-Last-Update: 2013-07-23
+Reviewed-by: Guido Trotter <ultrotter at google.com>
 ---
  daemons/daemon-util.in |   28 ++++++++++++++++++++++++++++
  1 file changed, 28 insertions(+)
 
 diff --git a/daemons/daemon-util.in b/daemons/daemon-util.in
-index 9481dc0..1d54979 100644
+index 9481dc0..2be14e9 100644
 --- a/daemons/daemon-util.in
 +++ b/daemons/daemon-util.in
 @@ -311,6 +311,34 @@ stop_all() {
@@ -23,7 +22,7 @@ index 9481dc0..1d54979 100644
  }
  
 +# SIGHUP a process to force re-opening its logfiles
-+rotate() {
++rotate_logs() {
 +  if [[ "$#" -lt 1 ]]; then
 +    echo 'Missing daemon name.' >&2
 +    return 1
@@ -44,9 +43,9 @@ index 9481dc0..1d54979 100644
 +}
 +
 +# SIGHUP all processes
-+rotate_all() {
++rotate_all_logs() {
 +  for i in $(list_stop_daemons); do
-+    rotate $i
++    rotate_logs $i
 +  done
 +}
 +
diff --git a/debian/patches/series b/debian/patches/series
index 4a9a920..b68eda2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
-0001-daemon-util-provide-rotate-and-rotate_all-actions.patch
 fix-ganeti-cleaner-in-crontab.patch
+0001-daemon-util-provide-rotate_logs-and-rotate_all_logs-.patch

-- 
Ganeti packaging