summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-21 11:25:21 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-21 11:25:21 +0000
commit78514b15ee1d8f40bfc6b68594083b81cc7cfa9d (patch)
tree6868744f9129c36b150122dbfc3abe0a89aa482b
parentecea1450a81783bc4f88612a82c83a6dafb733da (diff)
downloaddrakx-backup-do-not-use-78514b15ee1d8f40bfc6b68594083b81cc7cfa9d.tar
drakx-backup-do-not-use-78514b15ee1d8f40bfc6b68594083b81cc7cfa9d.tar.gz
drakx-backup-do-not-use-78514b15ee1d8f40bfc6b68594083b81cc7cfa9d.tar.bz2
drakx-backup-do-not-use-78514b15ee1d8f40bfc6b68594083b81cc7cfa9d.tar.xz
drakx-backup-do-not-use-78514b15ee1d8f40bfc6b68594083b81cc7cfa9d.zip
when the return value of ask_from_ and ask_from is not used, do not have a
"Previous ->" or "Cancel" button (beware, black magic here :)
-rw-r--r--perl-install/interactive.pm2
1 files changed, 2 insertions, 0 deletions
diff --git a/perl-install/interactive.pm b/perl-install/interactive.pm
index d3710dfca..4f5ab4c44 100644
--- a/perl-install/interactive.pm
+++ b/perl-install/interactive.pm
@@ -355,11 +355,13 @@ sub ask_from_ {
my ($o, $common, $l) = @_;
ask_from_normalize($o, $common, $l);
@$l or return 1;
+ $common->{cancel} = '' if !defined wantarray();
ask_from_real($o, $common, $l);
}
sub ask_from_no_check {
my ($o, $common, $l) = @_;
ask_from_normalize($o, $common, $l);
+ $common->{cancel} = '' if !defined wantarray();
$o->ask_fromW($common, partition { !$_->{advanced} } @$l);
}
sub ask_from_real {