summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily11
-rw-r--r--debian/changelog7
2 files changed, 15 insertions, 3 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 35ee5db6c..3973e63b5 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -14,6 +14,9 @@
# 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)
#
@@ -319,6 +322,14 @@ if ! which apt-config >/dev/null ; then
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)
diff --git a/debian/changelog b/debian/changelog
index 377cc6b57..21772e5df 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
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