diff options
| author | damien <damien@mandriva.com> | 2001-08-01 12:46:04 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2001-08-01 12:46:04 +0000 |
| commit | 6b2e355b922573423259318edbd9f6ca09300f9b (patch) | |
| tree | 2e2317aaac21393631cd29af6af7b0d434052445 | |
| parent | ba93a8ab114af155e96b9e731e5a60d20a55b65e (diff) | |
| download | drakx-6b2e355b922573423259318edbd9f6ca09300f9b.tar drakx-6b2e355b922573423259318edbd9f6ca09300f9b.tar.gz drakx-6b2e355b922573423259318edbd9f6ca09300f9b.tar.bz2 drakx-6b2e355b922573423259318edbd9f6ca09300f9b.tar.xz drakx-6b2e355b922573423259318edbd9f6ca09300f9b.zip | |
added de-installation before installateion
| -rw-r--r-- | perl-install/network/isdn.pm | 10 |
1 files changed, 7 insertions, 3 deletions
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; } |