[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#341970: /etc/cron.daily/apt shouldn't download-upgradeable/autoclean if update failed?

Package: apt
Version: 0.6.43
Severity: minor
Tags: patch

Hello,

I frequently noticed that:
root@patst004:/var/lib/apt/periodic# lrt
total 2
drwxr-xr-x 5 root root 1024 Oct 21 18:14 ..
drwxr-xr-x 2 root root 1024 Oct 24 09:31 .
-rw-r--r-- 1 root root    0 Dec  3 06:26 update-stamp
-rw-r--r-- 1 root root    0 Dec  4 06:27 download-upgradeable-stamp
-rw-r--r-- 1 root root    0 Dec  4 06:27 autoclean-stamp

So download-upgradeable was successfull while update failed (here
because of some network pb).

imho that would make better sense to avoid download-upgradeable and
autoclean, in such a case?

Thanks in advance,
	Joel

PS: here is a possibilty of patch:
--- /etc/cron.daily/apt.Orig	2005-12-04 14:03:17.000000000 +0000
+++ /etc/cron.daily/apt	2005-12-04 14:29:22.000000000 +0000
@@ -160,6 +160,7 @@
     fi
 fi
 
+UPDATED=0
 UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
 if check_stamp $UPDATE_STAMP $UpdateInterval; then
     if apt-get -qq update 2>/dev/null; then
@@ -167,19 +168,22 @@
 	    dbus-send --system / app.apt.dbus.updated boolean:true
 	fi
         update_stamp $UPDATE_STAMP
+	UPDATED=1
     fi
 fi
 
-DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp
-if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
-    apt-get -qq -d dist-upgrade 2>/dev/null
-    update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
-fi
+if [ $UPDATED -eq 1 ]; then
+    DOWNLOAD_UPGRADEABLE_STAMP=/var/lib/apt/periodic/download-upgradeable-stamp
+    if check_stamp $DOWNLOAD_UPGRADEABLE_STAMP $DownloadUpgradeableInterval; then
+        apt-get -qq -d dist-upgrade 2>/dev/null
+        update_stamp $DOWNLOAD_UPGRADEABLE_STAMP
+    fi
 
-AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
-if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
-    apt-get -qq autoclean
-    update_stamp $AUTOCLEAN_STAMP
+    AUTOCLEAN_STAMP=/var/lib/apt/periodic/autoclean-stamp
+    if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then
+        apt-get -qq autoclean
+        update_stamp $AUTOCLEAN_STAMP
+    fi
 fi
 
 # check cache size 
====<>====

-- Package-specific info:

-- apt-config dump --

APT "";
APT::Architecture "i386";
APT::Build-Essential "";
APT::Build-Essential:: "build-essential";
APT::Get "";
APT::Get::Download-Only "false";
APT::Get::Show-Upgraded "true";
Dir "/";
Dir::State "var/lib/apt/";
Dir::State::lists "lists/";
Dir::State::cdroms "cdroms.list";
Dir::State::userstatus "status.user";
Dir::State::status "/var/lib/dpkg/status";
Dir::Cache "var/cache/apt/";
Dir::Cache::archives "/Debian-apt/Debian4Home-sid/archives/";
Dir::Cache::srcpkgcache "srcpkgcache.bin";
Dir::Cache::pkgcache "pkgcache.bin";
Dir::Etc "etc/apt/";
Dir::Etc::sourcelist "sources.list";
Dir::Etc::sourceparts "sources.list.d";
Dir::Etc::vendorlist "vendors.list";
Dir::Etc::vendorparts "vendors.list.d";
Dir::Etc::main "apt.conf";
Dir::Etc::parts "apt.conf.d";
Dir::Etc::preferences "preferences";
Dir::Bin "";
Dir::Bin::methods "/usr/lib/apt/methods";
Dir::Bin::dpkg "/usr/bin/dpkg";
DPkg "";
DPkg::Pre-Install-Pkgs "";
DPkg::Pre-Install-Pkgs:: "/usr/sbin/dpkg-preconfigure --apt || true";
DPkg::Post-Invoke "";
DPkg::Post-Invoke:: "if [ -x /usr/bin/debsums ]; then /usr/bin/debsums --generate=nocheck -sp /var/cache/apt/archives; fi";
DPkg::Post-Invoke:: "debsums --generate=nocheck -sp /Debian-apt/Debian4Home-sid/archives";
Acquire "";
Acquire::Source-Symlinks "true";
Debug "";
Debug::pkgProblemResolver "true";
Debug:: "space";

-- (no /etc/apt/preferences present) --


-- /etc/apt/sources.list --

# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-5 (20010428)]/" unstable main contrib non-free
#deb http://http.us.debian.org/debian/ stable main contrib non-free
#deb http://http.us.debian.org/debian/ testing main contrib non-free
#deb http://non-us.debian.org/debian-non-US/ stable/non-US main contrib non-free
#deb http://non-us.debian.org/debian-non-US/ testing/non-US main contrib non-free

#deb http://security.debian.org/ stable/updates main contrib non-free

# Uncomment if you want the apt-get source function to work
#deb-src http://http.us.debian.org/debian/ stable main contrib non-free
#deb-src http://non-us.debian.org/debian-non-US/ stable non-US

#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-5 (20010428)]/" unstable contrib main non-free
#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-4 (20010428)]/" unstable contrib main non-free
#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-3 (20010428)]/" unstable contrib main non-free
#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-2 (20010428)]/" unstable contrib main non-free
#deb "cdrom:[Debian GNU/Linux 2.3 _Woody_ - fsn.hu's i386 Binary-1 (20010428)]/" unstable contrib main non-free

deb http://ftp.de.debian.org/debian/ unstable main contrib non-free 
deb http://ftp.de.debian.org/debian/ experimental main contrib non-free 
# deb http://ftp.de.debian.org/debian-non-US/ unstable/non-US main contrib non-free 
deb-src http://ftp.de.debian.org/debian/ unstable main contrib non-free
deb-src http://ftp.de.debian.org/debian/ experimental main contrib non-free
# deb-src http://ftp.de.debian.org/debian-non-US/ unstable/non-US main contrib non-free 

# Chkrootkit
#deb http://lackof.org/taggart/debian woody/chkrootkit main
#deb-src http://lackof.org/taggart/debian woody/chkrootkit main

# Os-cillation (Xfld)
# deb http://www.os-cillation.de/debian/ binary/

## Just comment to save space [1]
# deb-src http://www.os-works.com/debian unstable main

# Progeny bin
# deb http://archive.progeny.com/debian unstable main contrib non-free
# deb http://archive.progeny.com/debian experimental main contrib non-free
# Progeny src
# deb-src http://archive.progeny.com/debian unstable main contrib non-free
# deb-src http://archive.progeny.com/debian experimental main contrib non-free

# Ubuntu too :-)
# deb http://archive.ubuntu.com/ubuntu/ hoary main restricted universe multiverse
# deb-src http://archive.ubuntu.com/ubuntu/ hoary main restricted universe
# deb-src http://archive.ubuntulinux.org/ubuntu/ hoary main restricted universe
# deb http://security.ubuntu.com/ubuntu hoary-security main restricted
# deb-src http://security.ubuntu.com/ubuntu hoary-security main restricted
# deb-src http://security.ubuntulinux.org/ubuntu hoary-security main restricted

# New breezy
# deb-src http://archive.ubuntu.com/ubuntu/ breezy main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ breezy main restricted universe multiverse
# deb-src http://archive.ubuntu.com/ubuntu/ breezy-security main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ breezy-security main restricted universe multiverse
# deb-src http://archive.ubuntu.com/ubuntu/ breezy-updates main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ breezy-updates main restricted universe multiverse

# New dapper?
deb-src http://archive.ubuntu.com/ubuntu/ dapper main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ dapper main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ dapper-security main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ dapper-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ dapper-updates main restricted universe multiverse
# deb-src http://archive.ubuntulinux.org/ubuntu/ dapper-updates main restricted universe multiverse

# Some alioth stuff
deb http://rapt-proxy.alioth.debian.org/debian ./
deb-src http://rapt-proxy.alioth.debian.org/debian ./

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.6.14.3-686
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)

Versions of packages apt depends on:
ii  libc6                         2.3.5-8.1  GNU C Library: Shared libraries an
ii  libgcc1                       1:4.0.2-5  GCC support library
ii  libstdc++6                    4.0.2-5    The GNU Standard C++ Library v3

apt recommends no packages.

-- no debconf information
Reply to: