Hello community,
here is the log from the commit of package yast2-instserver for
openSUSE:Factory checked in at 2020-07-28 17:25:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-instserver (Old)
and /work/SRC/openSUSE:Factory/.yast2-instserver.new.3592 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-instserver"
Tue Jul 28 17:25:32 2020 rev:61 rq:823032 version:4.3.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-instserver/yast2-instserver.changes
2019-08-23 11:10:03.966455992 +0200
+++
/work/SRC/openSUSE:Factory/.yast2-instserver.new.3592/yast2-instserver.changes
2020-07-28 17:26:06.185956795 +0200
@@ -1,0 +2,6 @@
+Mon Jul 27 15:22:57 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------
Old:
----
yast2-instserver-4.2.3.tar.bz2
New:
----
yast2-instserver-4.3.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-instserver.spec ++++++
--- /var/tmp/diff_new_pack.vZ92ot/_old 2020-07-28 17:26:07.725958542 +0200
+++ /var/tmp/diff_new_pack.vZ92ot/_new 2020-07-28 17:26:07.729958547 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-instserver
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.2.3
+Version: 4.3.0
Release: 0
Summary: YaST2 - Installation Server Configuration and Management
License: GPL-2.0-or-later
++++++ yast2-instserver-4.2.3.tar.bz2 -> yast2-instserver-4.3.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.2.3/CONTRIBUTING.md
new/yast2-instserver-4.3.0/CONTRIBUTING.md
--- old/yast2-instserver-4.2.3/CONTRIBUTING.md 2019-08-22 12:57:16.000000000
+0200
+++ new/yast2-instserver-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-instserver-4.2.3/package/yast2-instserver.changes
new/yast2-instserver-4.3.0/package/yast2-instserver.changes
--- old/yast2-instserver-4.2.3/package/yast2-instserver.changes 2019-08-22
12:57:16.000000000 +0200
+++ new/yast2-instserver-4.3.0/package/yast2-instserver.changes 2020-07-27
21:59:09.000000000 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jul 27 15:22:57 UTC 2020 - Josef Reidinger <[email protected]>
+
+- Handle exceptions when parsing xml file (related to bsc#1170886)
+- 4.3.0
+
+-------------------------------------------------------------------
Thu Aug 22 12:50:15 CEST 2019 - [email protected]
- Using rb_default_ruby_abi tag in the spec file in order to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.2.3/package/yast2-instserver.spec
new/yast2-instserver-4.3.0/package/yast2-instserver.spec
--- old/yast2-instserver-4.2.3/package/yast2-instserver.spec 2019-08-22
12:57:16.000000000 +0200
+++ new/yast2-instserver-4.3.0/package/yast2-instserver.spec 2020-07-27
21:59:09.000000000 +0200
@@ -17,7 +17,7 @@
Name: yast2-instserver
-Version: 4.2.3
+Version: 4.3.0
Release: 0
Summary: YaST2 - Installation Server Configuration and Management
Url: https://github.com/yast/yast-instserver
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-instserver-4.2.3/src/modules/Instserver.rb
new/yast2-instserver-4.3.0/src/modules/Instserver.rb
--- old/yast2-instserver-4.2.3/src/modules/Instserver.rb 2019-08-22
12:57:16.000000000 +0200
+++ new/yast2-instserver-4.3.0/src/modules/Instserver.rb 2020-07-27
21:59:09.000000000 +0200
@@ -14,6 +14,8 @@
module Yast
class InstserverClass < Module
+ include Yast::Logger
+
NFS_SERVER_SERVICE = "nfs-server".freeze
def main
@@ -1099,9 +1101,13 @@
c = {}
if SCR.Read(path(".target.size"), @ConfigFile) != -1
- c = XML.XMLToYCPFile(@ConfigFile)
- # TRANSLATORS: Error message
- Report.Error(_("Cannot read current settings.")) unless c
+ begin
+ c = XML.XMLToYCPFile(@ConfigFile)
+ rescue XMLDeserializationError => e
+ # TRANSLATORS: Error message
+ Report.Error(_("Cannot read current settings."))
+ log.error "Failed to parse #{@ConfigFile}: #{e.inspect}"
+ end
end
all = Ops.get_list(c, "configurations", [])
@@ -1180,10 +1186,13 @@
c = PrepareConfigs()
xml = { "configurations" => c, "servers" => @ServerSettings }
- ret = XML.YCPToXMLFile(:instserver, xml, @ConfigFile)
-
- # Error message
- Report.Error(_("Cannot write settings.")) unless ret
+ begin
+ XML.YCPToXMLFile(:instserver, xml, @ConfigFile)
+ rescue XMLSerializationError => e
+ # Error message
+ Report.Error(_("Cannot write settings."))
+ log.error "writting settings failed with #{e.inspect}"
+ end
# run SuSEconfig
return false if Abort()
