Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at 2015-10-28 17:18:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes
2015-10-20 16:22:06.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new/yast2-packager.changes
2015-10-28 17:18:07.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Oct 21 14:29:50 UTC 2015 - lsle...@suse.cz
+
+- fixed crash (missing nil check) at ProductLicense.rb when
+ displaying EULA in the firstboot workflow in a Studio image
+ (bsc#951210)
+- 3.1.83
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-3.1.82.tar.bz2
New:
----
yast2-packager-3.1.83.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.Pr2qtn/_old 2015-10-28 17:18:08.000000000 +0100
+++ /var/tmp/diff_new_pack.Pr2qtn/_new 2015-10-28 17:18:08.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.82
+Version: 3.1.83
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-packager-3.1.82.tar.bz2 -> yast2-packager-3.1.83.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.82/package/yast2-packager.changes
new/yast2-packager-3.1.83/package/yast2-packager.changes
--- old/yast2-packager-3.1.82/package/yast2-packager.changes 2015-10-16
10:38:09.000000000 +0200
+++ new/yast2-packager-3.1.83/package/yast2-packager.changes 2015-10-22
10:38:08.000000000 +0200
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Wed Oct 21 14:29:50 UTC 2015 - lsle...@suse.cz
+
+- fixed crash (missing nil check) at ProductLicense.rb when
+ displaying EULA in the firstboot workflow in a Studio image
+ (bsc#951210)
+- 3.1.83
+
+-------------------------------------------------------------------
Fri Oct 16 08:21:20 UTC 2015 - lsle...@suse.cz
- repository manager - properly close the main window when aborting
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.82/package/yast2-packager.spec
new/yast2-packager-3.1.83/package/yast2-packager.spec
--- old/yast2-packager-3.1.82/package/yast2-packager.spec 2015-10-16
10:38:09.000000000 +0200
+++ new/yast2-packager-3.1.83/package/yast2-packager.spec 2015-10-22
10:38:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 3.1.82
+Version: 3.1.83
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-3.1.82/src/modules/ProductLicense.rb
new/yast2-packager-3.1.83/src/modules/ProductLicense.rb
--- old/yast2-packager-3.1.82/src/modules/ProductLicense.rb 2015-10-16
10:38:09.000000000 +0200
+++ new/yast2-packager-3.1.83/src/modules/ProductLicense.rb 2015-10-22
10:38:08.000000000 +0200
@@ -1087,7 +1087,7 @@
# Ask user to confirm license agreement
- # @param [Fixnum] src_id integer repository to get the license from.
+ # @param [Fixnum,nil] src_id integer repository to get the license from.
# If set to 'nil', the license is considered to belong to a base product
# @param [String] dir string directory to look for the license in if
src_id is nil
# and not 1st stage installation
@@ -1145,12 +1145,17 @@
licenses_ref = arg_ref(licenses)
- 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
+ if src_id
+ repo_data = Pkg::SourceGeneralData(src_id)
+
+ if repo_data
+ label = repo_data["name"]
+ # TRANSLATORS: %s is an extension name
+ # e.g. "SUSE Linux Enterprise Software Development Kit"
+ title = _("%s License Agreement") % label unless label.empty?
+ end
end
DisplayLicenseDialogWithTitle(
@@ -1163,7 +1168,7 @@
)
licenses = licenses_ref.value
- update_license_archive_location(src_id)
+ update_license_archive_location(src_id) if src_id
# Display info as a popup if exists
InstShowInfo.show_info_txt(@info_file) if @info_file != nil
@@ -1616,7 +1621,10 @@
# 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"]
+ repo_data = Pkg::SourceGeneralData(src_id)
+ return unless repo_data
+
+ src_url = repo_data["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)))
