summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2001-08-04 12:43:27 +0000
committerPascal Rigaux <pixel@mandriva.com>2001-08-04 12:43:27 +0000
commit5f14093229564196ffa2a3ad63c6f6d279fc8f79 (patch)
tree25340af3a5e96be5fe811290214d2c2609099f45
parente5d2c05ffabb6c14fc6840e658f8c92155a052e7 (diff)
downloaddrakx-5f14093229564196ffa2a3ad63c6f6d279fc8f79.tar
drakx-5f14093229564196ffa2a3ad63c6f6d279fc8f79.tar.gz
drakx-5f14093229564196ffa2a3ad63c6f6d279fc8f79.tar.bz2
drakx-5f14093229564196ffa2a3ad63c6f6d279fc8f79.tar.xz
drakx-5f14093229564196ffa2a3ad63c6f6d279fc8f79.zip
add the feather feature, but do not enable it
-rw-r--r--perl-install/install_steps_gtk.pm22
1 files changed, 17 insertions, 5 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index ab59b501e..edee069b2 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -322,11 +322,13 @@ sub reallyChooseGroups {
sub choosePackagesTree {
my ($o, $packages) = @_;
+
+ my $available = install_any::getAvailableSpace($o);
+ my $availableCorrected = pkgs::invCorrectSize($available / sqr(1024)) * sqr(1024);
+
my $common; $common = { get_status => sub {
my $size = pkgs::selectedSize($packages);
- _("Total size: %d / %d MB",
- pkgs::correctSize($size / sqr(1024)),
- install_any::getAvailableSpace($o) / sqr(1024));
+ _("Total size: %d / %d MB", pkgs::correctSize($size / sqr(1024)), $available / sqr(1024));
},
node_state => sub {
my $p = pkgs::packageByName($packages,$_[0]) or return;
@@ -393,7 +395,7 @@ sub choosePackagesTree {
my $p = $packages->{names}{$_};
pkgs::packageFlagSelected($p) or $size += pkgs::packageSize($p);
}
- if (pkgs::correctSize($size / sqr(1024)) > install_any::getAvailableSpace($o) / sqr(1024)) {
+ if (pkgs::correctSize($size / sqr(1024)) > $available / sqr(1024)) {
return $o->ask_warn('', _("You can't select this package as there is not enough space left to install it"));
}
@@ -446,7 +448,17 @@ sub choosePackagesTree {
help => _("Load/Save on floppy"),
wait_message => _("Updating package selection"),
code => sub { $o->loadSavePackagesOnFloppy($packages); 1; },
- }, ],
+ },
+ if_(0,
+ { icon => 'feather',
+ help => _("Minimal install"),
+ code => sub {
+
+ install_any::unselectMostPackages($o);
+ pkgs::setSelectedFromCompssList($packages, { SYSTEM => 1 }, 4, $availableCorrected);
+ 1;
+ } }),
+ ],
state => {
auto_deps => 1,
flat => 0,