summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-19 13:02:20 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-19 13:02:20 +0000
commit34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9 (patch)
tree8addc8d5e004390582414b33eac47eef97db5ee7 /perl-install
parent718714a12fed7fcea036386daba6a652cd65d830 (diff)
downloaddrakx-34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9.tar
drakx-34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9.tar.gz
drakx-34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9.tar.bz2
drakx-34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9.tar.xz
drakx-34e4d7a15547b210a6c6a98e9f2c8c9b089f75c9.zip
- add a special license for google programs (only for "Powerpack" product)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm9
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps_interactive.pm2
3 files changed, 10 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 0e1bc828d..a1b691e32 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -935,7 +935,7 @@ sub display_release_notes {
}
sub acceptLicense {
- my ($in) = @_;
+ my ($in, $google) = @_;
require messages;
my $ext = $in->isa('interactive::gtk') ? '.html' : '.txt';
@@ -957,10 +957,15 @@ sub acceptLicense {
my $r = $::testing ? 'Accept' : 'Refuse';
+ my $license = join("\n\n\n",
+ messages::main_license($google, $google),
+ messages::warning_about_patents(),
+ if_($google, messages::google_provisions()));
+
$in->ask_from_({ title => N("License agreement"),
focus_first => 1,
cancel => N("Quit"),
- messages => formatAlaTeX(messages::main_license() . "\n\n\n" . messages::warning_about_patents()),
+ messages => formatAlaTeX($license),
interactive_help_id => 'acceptLicense',
callbacks => { ok_disabled => sub { $r eq 'Refuse' } },
},
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 6cf0cf7b2..f8c4f2d64 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- add a special license for google programs (only for "Powerpack" product)
+
Version 11.47.1 - 17 September 2008
- bug fix: add mandatory new modules for dm-crypt
diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm
index 80bf5f8a9..de9ebe1e4 100644
--- a/perl-install/install/steps_interactive.pm
+++ b/perl-install/install/steps_interactive.pm
@@ -53,7 +53,7 @@ sub acceptLicense {
my ($o) = @_;
return if $o->{useless_thing_accepted};
- any::acceptLicense($o);
+ any::acceptLicense($o, $o->{meta_class} eq 'powerpack');
}
sub selectLanguage {