summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-12-22 10:17:11 +0000
committerFrancois Pons <fpons@mandriva.com>1999-12-22 10:17:11 +0000
commit3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7 (patch)
tree04e400d2276acd441d444aa46ab5767077153e1e
parent50d8f9cde126659428ee95eb30457d4c5370c5f6 (diff)
downloaddrakx-3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7.tar
drakx-3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7.tar.gz
drakx-3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7.tar.bz2
drakx-3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7.tar.xz
drakx-3c8f4fe3b7b15bd261a7c278d88c8e7a9498afc7.zip
*** empty log message ***
-rw-r--r--perl-install/install_steps_interactive.pm2
-rw-r--r--perl-install/pkgs.pm2
-rw-r--r--tools/Makefile1
3 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1d6bf4c0c..c67527193 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -524,7 +524,7 @@ sub addUser($) {
my @shells = install_any::shells($o);
if ($o->{security} < 2 && !$clicked || $o->ask_from_entries_refH(
- [ _("Add user"), _("Accept user"), _("Done") ],
+ [ _("Add user"), _("Accept user"), $o->{security} > 4 && !@{$o->{users}} ? () : _("Done") ],
_("Enter a user\n%s", $o->{users} ? _("(already added %s)", join(", ", map { $_->{realname} || $_->{name} } @{$o->{users}})) : ''),
[
_("Real name") => \$u->{realname},
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 9cd90bc9d..e22eed6de 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -499,7 +499,7 @@ sub selectPackagesToUpgrade($$$;$$) {
c::headerGetEntry($header, 'version'). '-' .
c::headerGetEntry($header, 'release'));
if ($toRemove{$otherPackage}) {
- if (c::headerGetEntry($header, 'name') eq 'libtermcap') {
+ if ($packages->{c::headerGetEntry($header, 'name')}{base}) {
delete $toRemove{$otherPackage}; #- keep it selected, but force upgrade.
} else {
my @files = c::headerGetEntry($header, 'filenames');
diff --git a/tools/Makefile b/tools/Makefile
index 654345ef8..5e4a5764b 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -15,6 +15,7 @@ $(DIRS):
install:
$(MAKE) gendepslist rpm2header xhost+
install make_mdkinst_stage2 gendepslist rpm2header genhdlist $(ROOTDEST)/misc
+ mkdir -p $(DEST)/usr/bin
install -s xhost+ $(DEST)/usr/bin
xhost+: %: %.c