From cbe19b4da0b447adc8d9ceb9de3a55341df7f106 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 19 Sep 2008 12:44:08 +0000
Subject: move {useless_thing_accepted} special case in install

---
 perl-install/any.pm                       | 2 --
 perl-install/install/steps_interactive.pm | 2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install')

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);
 }
 
-- 
cgit v1.2.1