Hello community,
here is the log from the commit of package yast2-metapackage-handler for
openSUSE:Factory checked in at 2020-07-24 09:52:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-metapackage-handler (Old)
and /work/SRC/openSUSE:Factory/.yast2-metapackage-handler.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-metapackage-handler"
Fri Jul 24 09:52:43 2020 rev:53 rq:822145 version:4.3.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/yast2-metapackage-handler/yast2-metapackage-handler.changes
2020-01-30 09:41:15.337485443 +0100
+++
/work/SRC/openSUSE:Factory/.yast2-metapackage-handler.new.3592/yast2-metapackage-handler.changes
2020-07-24 09:53:47.613268734 +0200
@@ -1,0 +2,6 @@
+Tue Jul 21 10:57:39 UTC 2020 - Ancor Gonzalez Sosa <[email protected]>
+
+- Fixed a crash when ~/.y2usersettings is missing (bsc#1173781)
+- 4.3.0
+
+-------------------------------------------------------------------
Old:
----
yast2-metapackage-handler-4.1.1.tar.bz2
New:
----
yast2-metapackage-handler-4.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-metapackage-handler.spec ++++++
--- /var/tmp/diff_new_pack.MDfebG/_old 2020-07-24 09:53:49.145270353 +0200
+++ /var/tmp/diff_new_pack.MDfebG/_new 2020-07-24 09:53:49.145270353 +0200
@@ -12,12 +12,12 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: yast2-metapackage-handler
-Version: 4.1.1
+Version: 4.3.0
Release: 0
Summary: YaST2 - Easy Installation of Add-on RPMs using Metapackages
License: GPL-2.0-or-later
++++++ yast2-metapackage-handler-4.1.1.tar.bz2 ->
yast2-metapackage-handler-4.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-metapackage-handler-4.1.1/CONTRIBUTING.md
new/yast2-metapackage-handler-4.3.0/CONTRIBUTING.md
--- old/yast2-metapackage-handler-4.1.1/CONTRIBUTING.md 2019-11-18
15:22:22.000000000 +0100
+++ new/yast2-metapackage-handler-4.3.0/CONTRIBUTING.md 1970-01-01
01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-YaST Contribution Guidelines
-============================
-
-YaST is an open source project and as such it welcomes all kinds of
-contributions. If you decide to contribute, please follow these guidelines to
-ensure the process is effective and pleasant both for you and the YaST
maintainers.
-
-There are two main forms of contribution: reporting bugs and performing code
-changes.
-
-Bug Reports
------------
-
-If you find a problem, please report it either using
-[Bugzilla](https://bugzilla.suse.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2)
-or [GitHub issues](../../issues). (For Bugzilla, use the [simplified
-registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp)
-if you don't have an account yet.)
-
-When creating a bug report, please follow our [bug reporting
-guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug).
-
-We can't guarantee that every bug will be fixed, but we'll try.
-
-Code Changes
-------------
-
-We welcome all kinds of code contributions, from simple bug fixes to
significant
-refactorings and implementation of new features. However, before making any
-non-trivial contribution, get in touch with us first — this can prevent wasted
-effort on both sides. Also, have a look at our [development
-documentation](http://en.opensuse.org/openSUSE:YaST_development).
-
-To send us your code change, use GitHub pull requests. The workflow is as
-follows:
-
- 1. Fork the project.
-
- 2. Create a topic branch based on `master`.
-
- 3. Implement your change, including tests (if possible). Make sure you adhere
- to the [Ruby style
- guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md).
-
- 4. Update the package version (in `packages/*.spec`, usually by
- `rake version:bump`) and add a new entry to the `package/*.changes` file
- (by `osc vc package`).
- For bigger changes or changes which need longer discussion it is advised
to
- add this as a separate last commit so it can be easily updated when
another
- change is merged in the meantime.
-
- 5. Make sure your change didn't break anything by building the RPM package
- (`rake osc:build`). The build process includes running the full testsuite.
-
- 6. Publish the branch and create a pull request.
-
- 7. YaST developers will review your change and possibly point out issues.
- Adapt the code under their guidance until they are all resolved.
-
- 8. Finally, the pull request will get merged or rejected.
-
-See also [GitHub's guide on
-contributing](https://help.github.com/articles/fork-a-repo).
-
-If you want to do multiple unrelated changes, use separate branches and pull
-requests.
-
-### Commits
-
-Each commit in the pull request should do only one thing, which is clearly
-described by its commit message. Especially avoid mixing formatting changes and
-functional changes into one commit. When writing commit messages, adhere to
-[widely used
-conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-
-If your commit is related to a bug in Bugzilla or an issue on GitHub, make sure
-you mention it in the commit message for cross-reference. Use format like
-bnc#775814 or gh#yast/yast-foo#42. See also [GitHub
-autolinking](https://help.github.com/articles/github-flavored-markdown#references)
-and [openSUSE abbreviation
-reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations).
-
-Additional Information
-----------------------
-
-If you have any question, feel free to ask at the [development mailing
-list](http://lists.opensuse.org/yast-devel/) or at the
-[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode.
-We'll do our best to provide a timely and accurate answer.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-4.1.1/package/yast2-metapackage-handler.changes
new/yast2-metapackage-handler-4.3.0/package/yast2-metapackage-handler.changes
---
old/yast2-metapackage-handler-4.1.1/package/yast2-metapackage-handler.changes
2019-11-18 15:22:22.000000000 +0100
+++
new/yast2-metapackage-handler-4.3.0/package/yast2-metapackage-handler.changes
2020-07-21 21:29:29.000000000 +0200
@@ -1,4 +1,16 @@
-------------------------------------------------------------------
+Tue Jul 21 10:57:39 UTC 2020 - Ancor Gonzalez Sosa <[email protected]>
+
+- Fixed a crash when ~/.y2usersettings is missing (bsc#1173781)
+- 4.3.0
+
+-------------------------------------------------------------------
+Fri Jan 24 10:02:03 UTC 2020 - Steffen Winterfeldt <[email protected]>
+
+- remove obsolete patch 103.diff
+- remove obsolete patch SLE.diff
+
+-------------------------------------------------------------------
Fri Nov 15 10:38:42 UTC 2019 - Steffen Winterfeldt <[email protected]>
- rewrite YMP file parsing (bsc#1138638)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-4.1.1/package/yast2-metapackage-handler.spec
new/yast2-metapackage-handler-4.3.0/package/yast2-metapackage-handler.spec
--- old/yast2-metapackage-handler-4.1.1/package/yast2-metapackage-handler.spec
2019-11-18 15:22:22.000000000 +0100
+++ new/yast2-metapackage-handler-4.3.0/package/yast2-metapackage-handler.spec
2020-07-21 21:29:29.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-metapackage-handler
-Version: 4.1.1
+Version: 4.3.0
Release: 0
Summary: YaST2 - Easy Installation of Add-on RPMs using Metapackages
License: GPL-2.0-or-later
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-metapackage-handler-4.1.1/src/modules/UserSettings.rb
new/yast2-metapackage-handler-4.3.0/src/modules/UserSettings.rb
--- old/yast2-metapackage-handler-4.1.1/src/modules/UserSettings.rb
2019-11-18 15:22:22.000000000 +0100
+++ new/yast2-metapackage-handler-4.3.0/src/modules/UserSettings.rb
2020-07-21 21:29:29.000000000 +0200
@@ -4,6 +4,8 @@
module Yast
class UserSettingsClass < Module
+ include Yast::Logger
+
def main
Yast.import "XML"
@@ -36,11 +38,7 @@
@FILENAME
)
Builtins.y2debug("Reading UserSettings from %1", @FILENAME)
- @settings = Convert.convert(
- XML.XMLToYCPFile(@FILENAME),
- :from => "map <string, any>",
- :to => "map <string, map <string, any>>"
- )
+ @settings = read_xml_file(@FILENAME)
nil
end
@@ -104,6 +102,19 @@
publish :function => :GetIntegerValue, :type => "integer (string, string)"
publish :function => :GetBooleanValue, :type => "boolean (string, string)"
publish :function => :SetValue, :type => "boolean (string, string, any)"
+
+ private
+
+ # Turns the content of the specified XML file into a hash
+ #
+ # @param path [String] name of the XML file
+ # @return [Hash] empty hash if the file does not exists or cannot be
processed
+ def read_xml_file(path)
+ XML.XMLToYCPFile(path)
+ rescue RuntimeError => e
+ log.debug "Using empty hash for #{path}: #{e.inspect}"
+ {}
+ end
end
UserSettings = UserSettingsClass.new
