From: Valentin Vidic Date: Wed, 5 Oct 2011 13:22:33 +0000 (+0200) Subject: Cleanup errors. X-Git-Tag: debian/6.0.0~6 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=04955f721fdc6e0ecd6a69d116609abd7e5eaffd;p=carnet-upgrade.git Cleanup errors. --- diff --git a/src/functions.sh b/src/functions.sh index 90eed9d..1c1dcdf 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -721,6 +721,7 @@ restore_configs () { if pkg amavisd-cn lt 3:2.6.5; then restore_file /etc/init.d/amavisd-cn + rm -f /etc/init.d/amavisd-cn.$backup_ext fi if pkg console-tools lt 1:0.2.3dbs-69.1; then @@ -778,7 +779,6 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { pkgadd carnet-keyring srce-keyring debian-archive-keyring - pkgupgrade dpkg apt debconf python-apt dpkg-dev dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring apt_update @@ -1055,7 +1055,7 @@ check_kernel_space() { log "Kernel package: $pkg" log "Kernel size: ${kernel_size}MB" - if LC_ALL=C apt-get -s install kernel-2.6-cn \ + if LC_ALL=C apt-get -s install kernel-2.6-cn 2>/dev/null \ | grep -q '^kernel-2.6-cn is already the newest version.$' then log "Not checking free space in /: kernel-2.6-cn already installed"