From 6b2e355b922573423259318edbd9f6ca09300f9b Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Wed, 1 Aug 2001 12:46:04 +0000
Subject: added de-installation before installateion

---
 perl-install/network/isdn.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 69b7c7a3d..00a001cf2 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -51,9 +51,13 @@ We recommand the light configuration.
 
 "), [ __("New configuration (isdn-light)"), __("Old configuration (isdn4net)")]
 				   ) or return;
-    #FIXME debug only
-    #system('urpmi --auto --best-output ' . join(' ', $e =~ /light/ ? 'isdn-light' : 'isdn4net', 'isdn4k-utils'));
-    $install->($e =~ /light/ ? 'isdn-light' : 'isdn4net', 'isdn4k-utils');
+    my ($rmpackage, $instpackage) = $e =~ /light/ ? ('isdn4net', 'isdn-light') : ('isdn4net', 'isdn-light');
+    if (!$::isStandalone) {
+	my $p = packageByName($in->{packages}, $rmpackage);
+	$p && packageFlagSelected($p) and pkgs::unselectPackage($in->{packages}, $p);
+    }
+    run_program::rooted($prefix, "rpm", "-e", "$rmpackage");
+    $install->($instpackage, 'isdn4k-utils');
     isdn_write_config_backend($isdn, $e =~ /light/, $netc);
     1;
 }
-- 
cgit v1.2.1