[debian-edu-commits] debian-edu/slbackup.git (#36) - wheezy-proposed-updates (branch) updated: debian/0.0.12-5-3-g6b646d0

[Holger Levsen]

The branch, wheezy-proposed-updates has been updated
       via  6b646d0893ca8d6b6b40d1757b658da6de9225c5 (commit)
      from  2534653f9a7d41b5e13122ed868ee4f366f5088c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6b646d0893ca8d6b6b40d1757b658da6de9225c5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 8 14:03:57 2013 +0200

    Revert "Drop CRON job /etc/cron.daily/slbackup. Re-enable configuration of slbackup via debconf templates (closes: #662914)."
    
    This reverts commit 65b6d40835db688ef38390a45cf8860a94275070.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog           |    3 ---
 debian/postinst            |   36 ++++++++++++++++++------------------
 debian/slbackup.cron.daily |    5 +++++
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 debian/slbackup.cron.daily

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 800e4a4..f0bfdf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,9 +28,6 @@ slbackup (0.0.12-4) experimental; urgency=low
       (Closes: #666917).
   * /debian/watch (new):
     + Watch for upstream tarball releases of slbackup.
-  * Change in conffile management:
-    + Drop CRON job /etc/cron.daily/slbackup. Re-enable configuration
-      of slbackup via debconf templates (closes: #662914).
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 27 Jul 2012 10:24:56 +0200
 
diff --git a/debian/postinst b/debian/postinst
index eb3d260..a3fb492 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -67,24 +67,24 @@ if ($ARGV[0] and $ARGV[0] eq "configure") {
 	my $datafile = new Config::General();
 	$datafile->save_file("/etc/slbackup/slbackup.conf", $config);
     }
-
-    # check if file specifying cron-job exists and if the user wanted to
-    # configure slbackup now, and make one the answers to both questions
-    # are "yes"
-    if ( ! -e "/etc/cron.d/slbackup" and $enable eq "true") {
-	# make cron-job
-	my $crontab = "# cron job for Skolelinux Backup (once a day)\n";
-	if ($enable eq "false") { $crontab .= "#"; }
-	my ($hour, $min) = split(/:/, $backuptime);
-	$crontab .= "$min $hour * * * root if [ -x " .
-	    "/usr/share/slbackup/slbackup-cron -a -f " .
-	    "/etc/slbackup/slbackup.conf ]; then " . 
-	    "/usr/share/slbackup/slbackup-cron ; fi\n";
-
-	open(CRONFILE, ">/etc/cron.d/slbackup");
-	print(CRONFILE "$crontab");
-	close(CRONFILE);
-    }
+    
+#    # check if file specifying cron-job exists and if the user wanted to
+#    # configure slbackup now, and make one the answers to both questions
+#    # are "yes"
+#    if ( ! -e "/etc/cron.d/slbackup" and $enable eq "true") {
+#	# make cron-job
+#	my $crontab = "# cron job for Skolelinux Backup (once a day)\n";
+#	if ($enable eq "false") { $crontab .= "#"; }
+#	my ($hour, $min) = split(/:/, $backuptime);
+#	$crontab .= "$min $hour * * * root if [ -x " .
+#	    "/usr/share/slbackup/slbackup-cron -a -f " .
+#	    "/etc/slbackup/slbackup.conf ]; then " . 
+#	    "/usr/share/slbackup/slbackup-cron ; fi\n";
+#    
+#	open(CRONFILE, ">/etc/cron.d/slbackup");
+#	print(CRONFILE "$crontab");
+#	close(CRONFILE);
+#    }
 }
 
 system('
diff --git a/debian/slbackup.cron.daily b/debian/slbackup.cron.daily
new file mode 100644
index 0000000..46bae21
--- /dev/null
+++ b/debian/slbackup.cron.daily
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+test -r /etc/slbackup/slbackup.conf || exit 0
+test -x /usr/share/slbackup/slbackup-cron || exit 0
+/usr/share/slbackup/slbackup-cron


hooks/post-receive
-- 
slbackup.git (Debian package slbackup)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup.git" (Debian package slbackup).