debian/apt.cron.daily: Script can be disabled by APT::Periodic::Enable=0 (Closes...

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 35ee5db6ce256f80c8ce814332e0df64fb127de1..3973e63b5c93bd8e0efe2d706d0d5eddffbf5dee 100644 (file)
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,9 @@
 #  Dir::Cache::Archive "archives/";
 #  - Set package archive directory
 #
 #  Dir::Cache::Archive "archives/";
 #  - Set package archive directory
 #

+#  APT::Periodic::Enable "1";
+#  - Enable the update/upgrade script (0=disable)
+#

 #  APT::Periodic::BackupArchiveInterval "0";
 #  - Backup after n-days if archive contents changed.(0=disable)
 #
 #  APT::Periodic::BackupArchiveInterval "0";
 #  - Backup after n-days if archive contents changed.(0=disable)
 #


@@ -319,6 +322,14 @@ if ! which apt-config >/dev/null ; then
        exit 0
 fi
 
        exit 0
 fi
 

+# check if the user really wants to do something
+AutoAptEnable=1  # default is yes
+eval $(apt-config shell AutoAptEnable APT::Periodic::Enable)
+
+if [ AutoAptEnable -eq 0 ]; then
+    exit 0
+fi
+

 # Set VERBOSE mode from  apt-config (or inherit from environment)
 VERBOSE=0
 eval $(apt-config shell VERBOSE APT::Periodic::Verbose)
 # Set VERBOSE mode from  apt-config (or inherit from environment)
 VERBOSE=0
 eval $(apt-config shell VERBOSE APT::Periodic::Verbose)

diff --git a/debian/changelog b/debian/changelog
index 377cc6b57fe6b409ce87ccbcac1a6152356a0167..21772e5df10ca23ac189be4a24f068570f056586 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 apt (0.7.22.2) unstable; urgency=low
 
 apt (0.7.22.2) unstable; urgency=low
 

-  * debian/apt.cron.daily: Make sure that VERBOSE is always set
-    before accessing it (Closes: #539366)
+  * debian/apt.cron.daily:
+    - Make sure that VERBOSE is always set (Closes: #539366)
+    - Script can be disabled by APT::Periodic::Enable=0 (Closes: #485476)

 
 

- -- Julian Andres Klode <jak@debian.org>  Thu, 06 Aug 2009 12:07:55 +0200
+ -- Julian Andres Klode <jak@debian.org>  Thu, 06 Aug 2009 12:17:19 +0200

 
 apt (0.7.22.1) unstable; urgency=low
 
 
 apt (0.7.22.1) unstable; urgency=low