From: Valentin Vidic Date: Thu, 27 Aug 2009 08:12:24 +0000 (+0200) Subject: Better function name for package upgrade. X-Git-Tag: debian/6.0.0~31 X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=3c85e249ce76b03c008fd3d6bf0b0c8608e2f5ac;p=carnet-upgrade.git Better function name for package upgrade. --- diff --git a/src/functions.sh b/src/functions.sh index 209bbe7..9e6b16f 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -600,7 +600,7 @@ upgrade () { return 1 esac - pkgadd_if_installed $packages + pkgupgrade $packages } # install packages introduced in this release @@ -931,7 +931,7 @@ apt_listchanges () { # make a silent installation of carnet and srce keyrings install_keyrings () { pkgadd carnet-keyring srce-keyring debian-archive-keyring - pkgadd_if_installed dpkg apt debconf python-apt dpkg-dev + pkgupgrade dpkg apt debconf python-apt dpkg-dev dpkg-reconfigure carnet-keyring srce-keyring debian-archive-keyring apt_update @@ -1009,7 +1009,7 @@ grep_installed () { } # only upgrade packages if they are already installed -pkgadd_if_installed () { +pkgupgrade () { local packages packages=$( grep_installed $* ) @@ -1021,13 +1021,13 @@ pkgadd_if_installed () { # make a silent upgrade to new libc6 upgrade_libc () { - DEBIAN_FRONTEND=noninteractive pkgadd_if_installed libc6 libc6-dev tzdata + DEBIAN_FRONTEND=noninteractive pkgupgrade libc6 libc6-dev tzdata } # upgrade apache2/php5 to lenny upgrade_apache2 () { pkgrm apache-common # prevents installation of apache2-suexec - pkgadd_if_installed libapache2-mod-php5 php5-cli php5-cn apache2-cn \ + pkgupgrade libapache2-mod-php5 php5-cli php5-cn apache2-cn \ php5-odbc php5-suhosin php-suhosin-cn }