summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2011-04-08 14:36:08 +0200
committerMichael Vogt <mvo@debian.org>2011-04-08 14:36:08 +0200
commita6dba137a3d8e011215ba86f55963f33fb8c45ff (patch)
treec769a443be0438678d629d00e5391309ed66e674 /debian
parent7ea7ac9efa88b73fc6ff30483a928ef49b95c015 (diff)
parentc996a75cabffa5d3e5bc610d9f1097c2edae606f (diff)
merged from the mvo branch
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.cron.daily2
-rw-r--r--debian/changelog10
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index c61bfb9bb..75986f5f5 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -466,7 +466,7 @@ fi
# auto upgrade all upgradeable packages
UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp
-if [ $UPDATED -eq 1 ] && which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
+if which unattended-upgrade >/dev/null && check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then
if unattended-upgrade $XUUPOPT; then
update_stamp $UPGRADE_STAMP
debug_echo "unattended-upgrade (success)"
diff --git a/debian/changelog b/debian/changelog
index 486a4de8c..6878debc5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,20 @@
apt (0.8.13.3) UNRELEASED; urgency=low
+ [ Julian Andres Klode ]
* apt-pkg/indexcopy.cc:
- Use RealFileExists() instead of FileExists(), allows amongst other
things a directory named Sources to exist on a CD-ROM (LP: #750694).
* apt-pkg/acquire-item.cc:
- Use Release files even if they cannot be verified (LP: #704595)
+
+ [ Michael Vogt ]
+ * mirror method:
+ - do not crash if the mirror file fails to download
+ * apt-pkg/aptconfiguration.cc:
+ - fix comparing for a empty string
+ * debian/apt.cron.daily:
+ - run unattended-upgrades even if there was a error during
+ the apt-get update (LP: #676295)
-- Julian Andres Klode <jak@debian.org> Thu, 07 Apr 2011 11:48:46 +0200