Merge pull request #115 from cwh42/addonlicense

Fixed addon-license dialog (bnc#899892 & bnc#899891)
yast · Mar 16, 2015 · 0190c1b · 0190c1b
2 parents 3ddfb6b + cf78e9e
commit 0190c1b
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Mar 16 09:45:04 UTC 2015 - cwh@suse.com
+
+- Added reponame to license's title (bnc#899892)
+- Display correct license URL for add-on repositories (bnc#899891)
+- 3.1.66
+
 -------------------------------------------------------------------
 Fri Mar 13 11:15:53 UTC 2015 - lslezak@suse.cz
 

diff --git a/package/yast2-packager.spec b/package/yast2-packager.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-packager
-Version:        3.1.65
+Version:        3.1.66
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/ProductLicense.rb b/src/modules/ProductLicense.rb
@@ -1144,15 +1144,27 @@ def AskLicenseAgreement(src_id, dir, patterns, action, enable_back, base_product
       end
 
       licenses_ref = arg_ref(licenses)
-      DisplayLicenseDialog(
+
+      label = Pkg::SourceGeneralData(src_id)["name"]
+      title = _("License Agreement")
+
+      if !label.empty?
+        # %s is an extension name, e.g. "SUSE Linux Enterprise Software Development Kit"
+        title = _("%s License Agreement") % label
+      end
+
+      DisplayLicenseDialogWithTitle(
         available_langs, # license id
         enable_back,
         @lic_lang,
         licenses_ref,
-        id
+        id,
+        title
       )
       licenses = licenses_ref.value
 
+      update_license_archive_location(src_id)
+
       # Display info as a popup if exists
       InstShowInfo.show_info_txt(@info_file) if @info_file != nil
 
@@ -1601,6 +1613,15 @@ def update_license_location(lang, licenses)
       end
     end
 
+    # update license location displayed in the dialog
+    # @param [Fixnum] src_id integer repository to get the license from.
+    def update_license_archive_location(src_id)
+      src_url = Pkg::SourceGeneralData(src_id)["url"]
+      if location_is_url?(src_url) && UI.WidgetExists(:printing_hint)
+        lic_url = File.join(src_url, @license_file_print)
+        UI.ReplaceWidget(:printing_hint, Label(license_download_label(lic_url)))
+      end
+    end
   end
 
   ProductLicense = ProductLicenseClass.new