summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-03 21:37:43 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-03 21:37:43 +0000
commit4124b22fb59ce95845241a78ca64d54bc6034db6 (patch)
tree8e44587ad92594f6d9eb9ba88c158c4101c8e2dd
parentf24c7b3ac6e3415166c18ea0df44c0777ae7a9e1 (diff)
downloaddrakx-4124b22fb59ce95845241a78ca64d54bc6034db6.tar
drakx-4124b22fb59ce95845241a78ca64d54bc6034db6.tar.gz
drakx-4124b22fb59ce95845241a78ca64d54bc6034db6.tar.bz2
drakx-4124b22fb59ce95845241a78ca64d54bc6034db6.tar.xz
drakx-4124b22fb59ce95845241a78ca64d54bc6034db6.zip
no_comment
-rw-r--r--docs/TODO2
-rw-r--r--perl-install/install2.pm2
-rw-r--r--perl-install/pkgs.pm4
3 files changed, 3 insertions, 5 deletions
diff --git a/docs/TODO b/docs/TODO
index 79f7489cc..6aa3d08ff 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -1,5 +1,3 @@
-clock is not set.
-
dd the different xmodmaps for every languages (maybe gnome-core xmodmaps can help)
xmodmap needed even for english as the backspace is not what it should
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 50e6ddfea..891212ae3 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -390,7 +390,7 @@ sub formatPartitions {
fs::mount_all([ grep { isExt2($_) || isSwap($_) } @{$o->{fstab}} ], $o->{prefix});
}
mkdir "$o->{prefix}/$_", 0755 foreach qw(dev etc etc/sysconfig etc/sysconfig/network-scripts
- home mnt tmp var var/tmp var/lib var/lib/rpm); #)
+ home mnt tmp var var/tmp var/lib var/lib/rpm);
}
sub choosePackages {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 86480ab70..a7e983c46 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -63,11 +63,11 @@ sub unselect($$) {
my $changed = 1;
while ($changed) {
$changed = 0;
- NEXT: foreach my $p (grep { $_->{selected} > 0 } values %$packages) {
+ NEXT: foreach my $p (grep { $_->{selected} > 0 && !$_->{base} } values %$packages) {
my $set = set_new(@{$p->{provides}});
foreach (@{$set->{list}}) {
my $q = Package($packages, $_);
- $q->{selected} == -1 and next NEXT;
+ $q->{selected} == -1 || $q->{base} and next NEXT;
set_add($set, @{$q->{provides}}) if $q->{selected};
}
$p->{selected} = 0;