summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-09-07 16:06:52 +0000
committerThierry Vignaud <tv@mandriva.org>2009-09-07 16:06:52 +0000
commit2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656 (patch)
tree45b5113e9b618335c40f7e210eaec87c61229745 /perl-install
parent1d549d397f5211f352bff67eaca0a6281f3026a0 (diff)
downloaddrakx-2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656.tar
drakx-2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656.tar.gz
drakx-2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656.tar.bz2
drakx-2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656.tar.xz
drakx-2c7d6d65c71d2c21a549bfdd5d7ed6fecf558656.zip
(get_release_notes) extract it out of acceptLicense() (needed by new
viewer)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm14
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 2c5d46f94..e73697932 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -965,10 +965,8 @@ sub display_release_notes {
return;
}
-sub acceptLicense {
- my ($in, $google) = @_;
- require messages;
-
+sub get_release_notes {
+ my ($in) = @_;
my $ext = $in->isa('interactive::gtk') ? '.html' : '.txt';
my $separator = $in->isa('interactive::gtk') ? "\n\n" : '';
@@ -985,6 +983,14 @@ sub acceptLicense {
# we do not handle links:
$release_notes =~ s!<a href=".*?">(.*?)</a>!$1!g;
+ $release_notes;
+}
+
+sub acceptLicense {
+ my ($in, $google) = @_;
+ require messages;
+
+ my $release_notes = get_release_notes($in);
my $r = $::testing ? 'Accept' : 'Refuse';