From 01011c3d05d7338500acb42d7da17a3ba8ca63cd Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Tue, 12 May 2009 12:44:27 +0200 Subject: [PATCH] Cleanup php4 remove function. --- src/actions/main.queue | 2 +- src/functions.sh | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/actions/main.queue b/src/actions/main.queue index d61ed2e..d2f9d95 100644 --- a/src/actions/main.queue +++ b/src/actions/main.queue @@ -51,7 +51,7 @@ true dist_upgrade # instaliraj ostatak # i ostatak true add_group_proc # za oidentd true pkgadd monit-cn -pkg php5-cn remove_php4 +true remove_php4 pkg kernel-2.6-cn dpkg-reconfigure kernel-2.6-cn # ovo bi trebalo biti predzadnje na popisu # - izvrsi sve uvjetne post_upgrade akcije diff --git a/src/functions.sh b/src/functions.sh index beccd14..ef321d6 100644 --- a/src/functions.sh +++ b/src/functions.sh @@ -975,9 +975,11 @@ remove_skey () { } # remove unsupported php version +# but leave the configuration just in case remove_php4 () { - # leave the configuration just in case - pkgrm_only php4-common || true + if pkg php5-cn && pkg php4-common; then + pkgrm_only php4-common + fi } # check if package is orphaned (nothing depends on it) -- 1.7.10.4