Merge pull request #98 from yast/display_eula_url

display where to download the extension EULA text (bnc#880685)
yast · Jun 9, 2014 · 542ed71 · 542ed71
2 parents 9e1150e + ac456b0
commit 542ed71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/package/yast2-registration.changes b/package/yast2-registration.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun  9 11:26:18 UTC 2014 - lslezak@suse.cz
+
+- display where to download the extension EULA text (bnc#880685)
+- 3.1.69
+
 -------------------------------------------------------------------
 Mon Jun  9 08:02:03 UTC 2014 - jreidinger@suse.com
 

diff --git a/package/yast2-registration.spec b/package/yast2-registration.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-registration
-Version:        3.1.68
+Version:        3.1.69
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -34,7 +34,7 @@ Requires:       yast2-ruby-bindings >= 3.1.12
 Requires:       rubygem-suse-connect >= 0.0.19
 Requires:       yast2-slp >= 3.1.2
 Requires:       yast2-add-on >= 3.1.8
-Requires:       yast2-packager >= 3.1.21
+Requires:       yast2-packager >= 3.1.22
 
 BuildRequires:  yast2 >= 3.1.26
 BuildRequires:  update-desktop-files
@@ -43,7 +43,7 @@ BuildRequires:  rubygem-yast-rake >= 0.1.8
 BuildRequires:  rubygem-rspec
 BuildRequires:  rubygem-suse-connect >= 0.0.19
 BuildRequires:  yast2-slp >= 3.1.2
-BuildRequires:  yast2-packager >= 3.1.21
+BuildRequires:  yast2-packager >= 3.1.22
 
 BuildArch:      noarch
 

diff --git a/src/lib/registration/ui/addon_eula_dialog.rb b/src/lib/registration/ui/addon_eula_dialog.rb
@@ -86,7 +86,7 @@ def accept_eula(addon)
 
           id = "#{addon.short_name} extension EULA"
           Yast::ProductLicense.SetAcceptanceNeeded(id, true)
-          # TODO reset ProductLicense::license_file_print attribute
+          Yast::ProductLicense.license_file_print = addon.eula_url
 
           # %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
           title = _("%s License Agreement") % addon.short_name