summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-03 19:09:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-03 19:09:54 +0000
commitd78efa2e22a869e8fd125232a66d872b352582a4 (patch)
treeee5d3d5e586a56fd6cc617369b88260cb57ac5d7
parent2a545cde0cd46aadf3b3dd7c26d5c2551dd4f107 (diff)
downloaddrakx-backup-do-not-use-d78efa2e22a869e8fd125232a66d872b352582a4.tar
drakx-backup-do-not-use-d78efa2e22a869e8fd125232a66d872b352582a4.tar.gz
drakx-backup-do-not-use-d78efa2e22a869e8fd125232a66d872b352582a4.tar.bz2
drakx-backup-do-not-use-d78efa2e22a869e8fd125232a66d872b352582a4.tar.xz
drakx-backup-do-not-use-d78efa2e22a869e8fd125232a66d872b352582a4.zip
- do not propose to deselect media if none can be deselected
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/steps_gtk.pm2
2 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index cec1455b5..52d73b490 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,4 +1,5 @@
- auto allocate: do not create /home if drive is smaller than 7GB
+- do not propose to deselect media if none can be deselected
- adapt code to upgrade from redhat for mdv extensions (& for Manbo
Core by the way)
diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm
index e4c7390f4..44c5c28e4 100644
--- a/perl-install/install/steps_gtk.pm
+++ b/perl-install/install/steps_gtk.pm
@@ -660,6 +660,7 @@ sub ask_deselect_media__copy_on_disk {
$w->{window},
gtkpack(
Gtk2::VBox->new(0, 5),
+ @names > 1 ? (
Gtk2::WrappedLabel->new(formatAlaTeX(N("The following installation media have been found.
If you want to skip some of them, you can unselect them now."))),
(map {
@@ -668,6 +669,7 @@ If you want to skip some of them, you can unselect them now."))),
$b;
} @names),
gtknew('HSeparator'),
+ ) : (),
if_($o_copy_rpms_on_disk,
Gtk2::WrappedLabel->new(formatAlaTeX(N("You have the option to copy the contents of the CDs onto the hard drive before installation.
It will then continue from the hard drive and the packages will remain available once the system is fully installed."))),