Hello community,
here is the log from the commit of package yast2-packager for openSUSE:Factory
checked in at 2019-03-06 19:02:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old)
and /work/SRC/openSUSE:Factory/.yast2-packager.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager"
Wed Mar 6 19:02:41 2019 rev:367 rq:681473 version:4.1.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes
2019-02-28 21:47:26.205421754 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-packager.new.28833/yast2-packager.changes
2019-03-06 19:02:44.165085362 +0100
@@ -1,0 +2,6 @@
+Mon Mar 4 14:27:30 UTC 2019 - Josef Reidinger <jreidin...@suse.com>
+
+- fix showing help text for product license (bsc#1126491)
+- 4.1.30
+
+-------------------------------------------------------------------
Old:
----
yast2-packager-4.1.29.tar.bz2
New:
----
yast2-packager-4.1.30.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-packager.spec ++++++
--- /var/tmp/diff_new_pack.7XyjTo/_old 2019-03-06 19:02:44.997085138 +0100
+++ /var/tmp/diff_new_pack.7XyjTo/_new 2019-03-06 19:02:44.997085138 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.1.29
+Version: 4.1.30
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ yast2-packager-4.1.29.tar.bz2 -> yast2-packager-4.1.30.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.1.29/package/yast2-packager.changes
new/yast2-packager-4.1.30/package/yast2-packager.changes
--- old/yast2-packager-4.1.29/package/yast2-packager.changes 2019-02-27
13:39:28.000000000 +0100
+++ new/yast2-packager-4.1.30/package/yast2-packager.changes 2019-03-04
15:33:15.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 4 14:27:30 UTC 2019 - Josef Reidinger <jreidin...@suse.com>
+
+- fix showing help text for product license (bsc#1126491)
+- 4.1.30
+
+-------------------------------------------------------------------
Wed Feb 27 12:14:18 UTC 2019 - mvid...@suse.com
- Use the correct path for /usr/bin/eject (bsc#1127138)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.1.29/package/yast2-packager.spec
new/yast2-packager-4.1.30/package/yast2-packager.spec
--- old/yast2-packager-4.1.29/package/yast2-packager.spec 2019-02-27
13:39:28.000000000 +0100
+++ new/yast2-packager-4.1.30/package/yast2-packager.spec 2019-03-04
15:33:15.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-packager
-Version: 4.1.29
+Version: 4.1.30
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-packager-4.1.29/src/lib/y2packager/widgets/product_license_content.rb
new/yast2-packager-4.1.30/src/lib/y2packager/widgets/product_license_content.rb
---
old/yast2-packager-4.1.29/src/lib/y2packager/widgets/product_license_content.rb
2019-02-27 13:39:28.000000000 +0100
+++
new/yast2-packager-4.1.30/src/lib/y2packager/widgets/product_license_content.rb
2019-03-04 15:33:15.000000000 +0100
@@ -13,6 +13,8 @@
require "yast"
require "cwm"
+Yast.import "ProductLicense"
+
module Y2Packager
module Widgets
# Widget to show a product's license content
@@ -53,6 +55,11 @@
update_license_text
end
+ # Help text for license content
+ def help
+ Yast::ProductLicense.GetLicenseDialogHelp
+ end
+
private
# @!attribute [w] language
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-packager-4.1.29/src/modules/ProductLicense.rb
new/yast2-packager-4.1.30/src/modules/ProductLicense.rb
--- old/yast2-packager-4.1.29/src/modules/ProductLicense.rb 2019-02-27
13:39:28.000000000 +0100
+++ new/yast2-packager-4.1.30/src/modules/ProductLicense.rb 2019-03-04
15:33:15.000000000 +0100
@@ -717,6 +717,16 @@
nil
end
+ # Help text for asking license for product
+ def GetLicenseDialogHelp
+ # help text
+ _(
+ "<p>Read the license agreement carefully and select\n" \
+ "one of the available options. If you do not agree to the license
agreement,\n" \
+ "the configuration will be aborted.</p>\n"
+ )
+ end
+
publish function: :AcceptanceNeeded, type: "boolean (string)"
publish function: :AskLicenseAgreement,
type: "symbol (integer, string, list <string>, string, " \
@@ -1132,15 +1142,6 @@
)
end
- def GetLicenseDialogHelp
- # help text
- _(
- "<p>Read the license agreement carefully and select\n" \
- "one of the available options. If you do not agree to the license
agreement,\n" \
- "the configuration will be aborted.</p>\n"
- )
- end
-
# Displays License dialog
def DisplayLicenseDialog(languages, back, license_language, licenses, id)
# dialog title
