do not raise if no license has to be accepted

yast · Aug 18, 2016 · 4a0aad7 · 4a0aad7
1 parent d372f66
commit 4a0aad7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-packager.changes b/package/yast2-packager.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Aug 18 10:55:06 CEST 2016 - schubi@suse.de
+
+- Do not raise an exception if no license is available (no licence
+  dir at all) to accept. This is still a fix for bnc#993285.
+- 3.1.115
+
 -------------------------------------------------------------------
 Tue Aug 16 14:16:01 UTC 2016 - 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.114
+Version:        3.1.115
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/ProductLicense.rb b/src/modules/ProductLicense.rb
@@ -843,7 +843,8 @@ def GetSourceLicenseDirectory(src_id, fallback_dir)
     # @param [Any] unique ID
     # @param [String] path to directory with unpacked licenses (mandatory)
     def cache_license_acceptance_needed(id, license_dir)
-      raise "Parameter 'license_dir' must not be nil" if license_dir.nil?
+      # license_dir can be nil if there is no license present (e.g. DUDs)
+      return if license_dir.nil?
 
       license_acceptance_needed = !FileUtils.Exists("#{license_dir}/no-acceptance-needed")
       SetAcceptanceNeeded(id, license_acceptance_needed)