summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-19 12:44:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-19 12:44:08 +0000
commitcbe19b4da0b447adc8d9ceb9de3a55341df7f106 (patch)
tree01c34820c9eace560b84aae1f06c9574980c507b
parent678dbcad7e400317fc0455f247a201855f4c91ce (diff)
downloaddrakx-cbe19b4da0b447adc8d9ceb9de3a55341df7f106.tar
drakx-cbe19b4da0b447adc8d9ceb9de3a55341df7f106.tar.gz
drakx-cbe19b4da0b447adc8d9ceb9de3a55341df7f106.tar.bz2
drakx-cbe19b4da0b447adc8d9ceb9de3a55341df7f106.tar.xz
drakx-cbe19b4da0b447adc8d9ceb9de3a55341df7f106.zip
move {useless_thing_accepted} special case in install
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/install/steps_interactive.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5ae7bc6c9..31e6b4373 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -955,8 +955,6 @@ sub acceptLicense {
# we do not handle links:
$release_notes =~ s!<a href=".*?">(.*?)</a>!$1!g;
- return if $o->{useless_thing_accepted};
-
my $r = $::testing ? 'Accept' : 'Refuse';
$o->ask_from_({ title => N("License agreement"),
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 67c786a2c..80bf5f8a9 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -51,6 +51,8 @@ sub kill_action {
sub acceptLicense {
my ($o) = @_;
+ return if $o->{useless_thing_accepted};
+
any::acceptLicense($o);
}