From 883e070b411abc63e7ab89efe88cbc51e320c139 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 4 Jan 2002 17:34:35 +0000
Subject: allow to use same identifier for security medium (1u). re-install
 urpmi. allow some error to be catched.

---
 perl-install/install_steps.pm | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'perl-install/install_steps.pm')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 14396d13d..3819e495d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -435,13 +435,7 @@ Consoles 1,3,4,7 may also contain interesting information";
     substInFile { s/^cdrom\n//; $_ .= "cdrom\n" if eof } "$msec/group.conf" if -d $msec;
     substInFile { s/^cdwriter\n//; $_ .= "cdwriter\n" if eof } "$msec/group.conf" if -d $msec;
 
-    my $pkg = pkgs::packageByName($o->{packages}, 'urpmi');
-    if ($pkg && pkgs::packageSelectedOrInstalled($pkg)) {
-	install_any::install_urpmi($o->{prefix}, 
-				   $::oem ? 'cdrom' : $o->{method}, #- HACK
-				   $o->{packages}{mediums});
-	pkgs::saveCompssUsers($o->{prefix}, $o->{packages}, $o->{compssUsers}, $o->{compssUsersSorted});
-    }
+    $o->install_urpmi;
 
 #    #- update language and icons for KDE.
 #    update_gnomekderc($_, 'Locale', Language => "") foreach list_skels($o->{prefix}, '.kderc');
@@ -525,6 +519,20 @@ sub copyKernelFromFloppy {
     fs::umount("/floppy");
 }
 
+sub install_urpmi {
+    my ($o) = @_;
+
+    my $pkg = pkgs::packageByName($o->{packages}, 'urpmi');
+    if ($pkg && pkgs::packageSelectedOrInstalled($pkg)) {
+	install_any::install_urpmi($o->{prefix}, 
+				   $::oem ? 'cdrom' : $o->{method}, #- HACK
+				   $o->{packages}{mediums});
+	pkgs::saveCompssUsers($o->{prefix}, $o->{packages}, $o->{compssUsers}, $o->{compssUsersSorted});
+    }
+
+
+}
+
 sub updateModulesFromFloppy {
     my ($o) = @_;
     return if $::testing || !$o->{updatemodules};
@@ -595,8 +603,11 @@ sub installUpates {
 
     upNetwork($o);
     require crypto;
-    my @crypto_packages = crypto::getPackages($o->{prefix}, $o->{packages}, $u->{mirror});
-    $o->pkg_install(@{$u->{packages} || []});
+    crypto::getPackages($o->{prefix}, $o->{packages}, $u->{mirror}) and
+	$o->pkg_install(@{$u->{packages} || []});
+
+    #- re-install urpmi with update security medium.
+    $o->install_urpmi;
 }
 
 sub summary {
-- 
cgit v1.2.1