Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2018-11-10 16:48:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Sat Nov 10 16:48:37 2018 rev:436 rq:646685 version:4.1.33 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2018-11-01 19:05:24.474018561 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new/yast2.changes 2018-11-10 16:48:40.980546001 +0100 @@ -1,0 +2,7 @@ +Tue Nov 6 14:14:04 UTC 2018 - [email protected] + +- WorkflowManager: Allow system roles to live in + /usr/share/system-roles/*.xml (bsc#1108176) +- 4.1.33 + +------------------------------------------------------------------- Old: ---- yast2-4.1.32.tar.bz2 New: ---- yast2-4.1.33.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.7cI6wo/_old 2018-11-10 16:48:42.416544181 +0100 +++ /var/tmp/diff_new_pack.7cI6wo/_new 2018-11-10 16:48:42.420544175 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.32 +Version: 4.1.33 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only ++++++ yast2-4.1.32.tar.bz2 -> yast2-4.1.33.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.32/library/control/src/modules/WorkflowManager.rb new/yast2-4.1.33/library/control/src/modules/WorkflowManager.rb --- old/yast2-4.1.32/library/control/src/modules/WorkflowManager.rb 2018-10-26 14:47:43.000000000 +0200 +++ new/yast2-4.1.33/library/control/src/modules/WorkflowManager.rb 2018-11-06 15:54:20.000000000 +0100 @@ -439,7 +439,18 @@ dir = addon_control_dir(src, cleanup: true) fetch_package(src, package, dir) - path = File.join(dir, "installation.xml") + # lets first try FHS compliant path (bsc#1114573) + # sadly no glob escaping - https://bugs.ruby-lang.org/issues/8258 + # but as we generate directory, it should be ok + files = Dir.glob("#{dir}/usr/share/system-roles/*.xml") + if files.size == 1 + path = files.first + elsif files.size > 1 + log.error "more then one file in system role #{files.inspect}" + path = files.first + else + path = File.join(dir, "installation.xml") + end return nil unless File.exist?(path) log.info("installation.xml path: #{path}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.32/library/control/test/workflow_manager_test.rb new/yast2-4.1.33/library/control/test/workflow_manager_test.rb --- old/yast2-4.1.32/library/control/test/workflow_manager_test.rb 2018-10-26 14:47:43.000000000 +0200 +++ new/yast2-4.1.33/library/control/test/workflow_manager_test.rb 2018-11-06 15:54:20.000000000 +0100 @@ -396,6 +396,13 @@ # the returned path contains "/installation.xml" at the end expect(subject.control_file(repo_id)).to end_with("/installation.xml") end + + it "returns path leading to system-roles dir if it exists" do + allow(Dir).to receive(:glob).and_return(["/tmp/usr/share/system-roles/superyast.xml"]) + expect(File).to receive(:exist?).with("/tmp/usr/share/system-roles/superyast.xml").and_return(true) + + expect(subject.control_file(repo_id)).to eq "/tmp/usr/share/system-roles/superyast.xml" + end end describe "#addon_control_dir" do diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.32/package/yast2.changes new/yast2-4.1.33/package/yast2.changes --- old/yast2-4.1.32/package/yast2.changes 2018-10-26 14:47:43.000000000 +0200 +++ new/yast2-4.1.33/package/yast2.changes 2018-11-06 15:54:20.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Nov 6 14:14:04 UTC 2018 - [email protected] + +- WorkflowManager: Allow system roles to live in + /usr/share/system-roles/*.xml (bsc#1108176) +- 4.1.33 + +------------------------------------------------------------------- Fri Oct 26 11:46:16 UTC 2018 - [email protected] - view_anymsg: allow user to switch to yast2-journal if file does @@ -10,7 +17,7 @@ - Added flag save_y2logs to control.xml file in order to save YaST logs at the end of installation (fate#325737) -- 4.1.31 +- 4.1.31 ------------------------------------------------------------------- Wed Oct 24 15:55:08 UTC 2018 - [email protected] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.32/package/yast2.spec new/yast2-4.1.33/package/yast2.spec --- old/yast2-4.1.32/package/yast2.spec 2018-10-26 14:47:43.000000000 +0200 +++ new/yast2-4.1.33/package/yast2.spec 2018-11-06 15:54:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.32 +Version: 4.1.33 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only
