summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-10-13 11:08:07 +0100
committerColin Guthrie <colin@mageia.org>2013-10-13 11:15:25 +0100
commitdbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba (patch)
tree99f6c16014484a661884dc5c87a34f9c183ac8e5
parent5fb0470a800c51333e3e3829dd4a0b626944f3c1 (diff)
downloaddrakx-dbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba.tar
drakx-dbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba.tar.gz
drakx-dbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba.tar.bz2
drakx-dbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba.tar.xz
drakx-dbd1542bd8d8a58ac8a6fb19db2ea96270ff67ba.zip
finish-install: Do not check for /usr/sbin/urpmi.update
This file is now 'hidden' in /usr/libexec and only used via it's wrapper script in mgaonline. This was originally changed from /usr/bin/urpmi back in 2001 by Pixel, but the current path for urpmi is /usr/sbin/urpmi, which seems to be as reliable as urpmi.update was before.
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/install2.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 3648c5680..4bdce4129 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- make urpmi install check more reliable (polkit related path change mga#11125)
+
Version 15.67 - 10 October 2013
- log when user reject applying updates (mga#11319)
diff --git a/perl-install/install/install2.pm b/perl-install/install/install2.pm
index d9b80db32..02888ff2c 100644
--- a/perl-install/install/install2.pm
+++ b/perl-install/install/install2.pm
@@ -739,7 +739,7 @@ sub finish_install() {
install::steps::cleanIfFailedUpgrade($o);
#- drop urpmi DB if urpmi is not installed:
- -e "$::prefix/usr/sbin/urpmi.update" or eval { rm_rf("$::prefix/var/lib/urpmi") };
+ -e "$::prefix/usr/sbin/urpmi" or eval { rm_rf("$::prefix/var/lib/urpmi") };
system("chroot", $::prefix, "bash", "-c", $o->{postInstallBeforeReboot}) if $o->{postInstallBeforeReboot};