summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-10-02 11:40:38 +0000
committerFrancois Pons <fpons@mandriva.com>2000-10-02 11:40:38 +0000
commit9add781ce47ba8978832c119dbbd16ce5644d68b (patch)
treeeb38cea903d7cd031cd46f4df7776163f49676aa
parent19bba6b33f207bc1b92ee8e2aba1c873bbe60c7c (diff)
downloaddrakx-9add781ce47ba8978832c119dbbd16ce5644d68b.tar
drakx-9add781ce47ba8978832c119dbbd16ce5644d68b.tar.gz
drakx-9add781ce47ba8978832c119dbbd16ce5644d68b.tar.bz2
drakx-9add781ce47ba8978832c119dbbd16ce5644d68b.tar.xz
drakx-9add781ce47ba8978832c119dbbd16ce5644d68b.zip
*** empty log message ***
-rw-r--r--perl-install/ChangeLog4
-rw-r--r--perl-install/install_steps.pm8
2 files changed, 8 insertions, 4 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 1a3b0e6d8..0891bf5fa 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-02 François Pons <fpons@mandrakesoft.com>
+
+ * install_any.pm: fixed installation of urpmi configuration.
+
2000-10-02 Pixel <pixel@mandrakesoft.com>
* mouse.pm (fullnames): fix i18n fix
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index ecb350543..34c38e57d 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -431,14 +431,14 @@ 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::packageFlagSelected($pkg)) {
+ install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]);
#- asked by jloup to disable urpmi for security level < 2, as it is managed a whole for
#- security <= 2 by msec on "/usr/share/msec/grpuser.sh --refresh", it has been accepted to
#- simply disable it :-(
-# my $pkg = pkgs::packageByName($o->{packages}, 'urpmi');
-# if ($pkg && pkgs::packageFlagSelected($pkg)) {
-# install_any::install_urpmi($o->{prefix}, $o->{method}, $o->{packages}[2]);
# substInFile { s/^urpmi\n//; $_ .= "urpmi\n" if eof } "$msec/group.conf" if -d $msec;
-# }
+ }
# #- update language and icons for KDE.
# update_userkderc($o->{prefix}, 'Locale', Language => "");