commit autoyast2 for openSUSE:Factory

1 Nov 2018

Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2018-11-01 19:07:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
 and      /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "autoyast2"

Thu Nov  1 19:07:40 2018 rev:249 rq:645264 version:4.0.65

Changes:
--------

--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes	2018-09-07 15:41:44.306386028 +0200
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes	2018-11-01 19:07:43.582027188 +0100
@@ -1,0 +2,33 @@
+Thu Oct 25 13:35:34 CEST 2018 - schubi@suse.de
+
+- Saving y2logs after the installation has been finished.
+  (fate#325737)
+- 4.0.65
+
+-------------------------------------------------------------------
+Mon Oct 22 08:25:08 WEST 2018 - igonzalezsosa@suse.com
+
+- Adapt schema to support the new way of defining a software
+  RAID (fate#326573).
+- 4.0.64
+
+-------------------------------------------------------------------
+Tue Oct 16 16:39:52 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Thu Oct 11 18:08:56 UTC 2018 - knut.anderssen@suse.com
+
+- AutoInstallRules:  Do a cleanup of the profile being merged with
+  (bsc#1108933).
+- 4.0.63
+
+-------------------------------------------------------------------
+Fri Sep 28 07:20:35 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYaST configuration module: Enable edit action for firewall
+  module (fate#324662).
+- 4.0.62
+
+-------------------------------------------------------------------

Old:
----
  autoyast2-4.0.61.tar.bz2

New:
----
  autoyast2-4.0.65.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.FsRGhZ/_old	2018-11-01 19:07:44.186027223 +0100
+++ /var/tmp/diff_new_pack.FsRGhZ/_new	2018-11-01 19:07:44.186027223 +0100
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.61
+Version:        4.0.65
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -309,6 +309,8 @@
 %{_prefix}/lib/YaST2/bin/fetch_image.sh
 %{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
 
+%license COPYING
+
 %dir /var/adm/autoinstall/
 %dir /var/adm/autoinstall/scripts
 %dir /var/adm/autoinstall/init.d

++++++ autoyast2-4.0.61.tar.bz2 -> autoyast2-4.0.65.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/package/autoyast2.changes new/autoyast2-4.0.65/package/autoyast2.changes
--- old/autoyast2-4.0.61/package/autoyast2.changes	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/package/autoyast2.changes	2018-10-29 13:46:19.000000000 +0100
@@ -1,4 +1,37 @@
 -------------------------------------------------------------------
+Thu Oct 25 13:35:34 CEST 2018 - schubi@suse.de
+
+- Saving y2logs after the installation has been finished.
+  (fate#325737)
+- 4.0.65
+
+-------------------------------------------------------------------
+Mon Oct 22 08:25:08 WEST 2018 - igonzalezsosa@suse.com
+
+- Adapt schema to support the new way of defining a software
+  RAID (fate#326573).
+- 4.0.64
+
+-------------------------------------------------------------------
+Tue Oct 16 16:39:52 CEST 2018 - schubi@suse.de
+
+- Added license file to spec.
+
+-------------------------------------------------------------------
+Thu Oct 11 18:08:56 UTC 2018 - knut.anderssen@suse.com
+
+- AutoInstallRules:  Do a cleanup of the profile being merged with
+  (bsc#1108933).
+- 4.0.63
+
+-------------------------------------------------------------------
+Fri Sep 28 07:20:35 UTC 2018 - knut.anderssen@suse.com
+
+- AutoYaST configuration module: Enable edit action for firewall
+  module (fate#324662).
+- 4.0.62
+
+-------------------------------------------------------------------
 Thu Aug 23 14:25:55 CEST 2018 - schubi@suse.de
 
 - AutoInstallRules: Fixed crash while merging profiles.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/package/autoyast2.spec new/autoyast2-4.0.65/package/autoyast2.spec
--- old/autoyast2-4.0.61/package/autoyast2.spec	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/package/autoyast2.spec	2018-10-29 13:46:19.000000000 +0100
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        4.0.61
+Version:        4.0.65
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -309,6 +309,8 @@
 %{_prefix}/lib/YaST2/bin/fetch_image.sh
 %{_prefix}/lib/YaST2/bin/autoyast-initscripts.sh
 
+%license COPYING
+
 %dir /var/adm/autoinstall/
 %dir /var/adm/autoinstall/scripts
 %dir /var/adm/autoinstall/init.d
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/autoyast-rnc/partitioning.rnc new/autoyast2-4.0.65/src/autoyast-rnc/partitioning.rnc
--- old/autoyast2-4.0.61/src/autoyast-rnc/partitioning.rnc	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/autoyast-rnc/partitioning.rnc	2018-10-29 13:46:19.000000000 +0100
@@ -20,7 +20,8 @@
     element disklabel  { text }? &
     element enable_snapshots { BOOLEAN }? &
     skip_list? &
-    partitions?
+    partitions? &
+    raid_options?
   }
 
 skip_list =
@@ -63,9 +64,7 @@
   | part_partition_id
   | part_partition_nr
   | part_partition_type
-  | part_raid_name
   | part_resize
-  | part_raid_options
   | part_raid_type
   | part_region
   | part_size
@@ -75,6 +74,8 @@
   | part_used_pool
   | part_subvolumes_prefix
   | device_order
+  | raid_name
+  | raid_options
   | subvolumes
   | create_subvolumes
 
@@ -116,9 +117,9 @@
 opt_raid = element opt_raid { option_str, option_value }
 opt_reserved_blocks =
   element opt_reserved_blocks { option_str, option_value }
-part_raid_name = element raid_name { text }
+raid_name = element raid_name { text }
 
-part_raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & part_raid_name? }
+raid_options = element raid_options { persistent_superblock? & chunk_size? & parity_algorithm? & raid_type? & device_order? & raid_name? }
 persistent_superblock = element persistent_superblock { BOOLEAN }
 raid_type = element raid_type { text }
 chunk_size = element chunk_size { text }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/clients/inst_autoconfigure.rb new/autoyast2-4.0.65/src/clients/inst_autoconfigure.rb
--- old/autoyast2-4.0.61/src/clients/inst_autoconfigure.rb	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/clients/inst_autoconfigure.rb	2018-10-29 13:46:19.000000000 +0100
@@ -349,6 +349,9 @@
       # Invoke SnapshotsFinish client to perform snapshots (if needed)
       WFM.CallFunction("snapshots_finish", ["Write"])
 
+      # Saving y2logs
+      WFM.CallFunction("save_y2logs")
+
       :next
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/fillup/sysconfig.autoinstall new/autoyast2-4.0.65/src/fillup/sysconfig.autoinstall
--- old/autoyast2-4.0.61/src/fillup/sysconfig.autoinstall	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/fillup/sysconfig.autoinstall	2018-10-29 13:46:19.000000000 +0100
@@ -33,4 +33,4 @@
 #
 # Listed modules have Edit button / action disabled at AutoYaST UI
 #
-FORBID_EDIT="firewall"
+FORBID_EDIT=""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/src/modules/AutoInstallRules.rb new/autoyast2-4.0.65/src/modules/AutoInstallRules.rb
--- old/autoyast2-4.0.61/src/modules/AutoInstallRules.rb	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/src/modules/AutoInstallRules.rb	2018-10-29 13:46:19.000000000 +0100
@@ -912,25 +912,26 @@
     def Merge(result_profile)
       base_profile = File.join(AutoinstConfig.tmpDir, "base_profile.xml")
       merge_profile = File.join(AutoinstConfig.tmpDir, "result.xml")
+      cleaned_profile = File.join(AutoinstConfig.tmpDir, "current.xml")
       ok = true
-      skip = false
       error = false
-      @tomerge.each do |file|
+      @tomerge.each_with_index do |file, iter|
         log.info("Working on file: #{file}")
         current_profile = File.join(AutoinstConfig.local_rules_location, file)
-        if !skip
-          if !XML_cleanup(current_profile, base_profile)
-            log.error("Error reading XML file")
-            message = _(
-              "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
-            )
-            message += XML.XMLError
-            Yast2::Popup.show(message, headline: :error)
-            error = true
-          end
-          skip = true
-        elsif !error
-          xsltret = merge_profiles(base_profile, current_profile, merge_profile)
+        dest_profile = iter == 0 ? base_profile : cleaned_profile
+        if !XML_cleanup(current_profile, dest_profile)
+          log.error("Error reading XML file")
+          message = _(
+            "The XML parser reported an error while parsing the autoyast profile. The error message is:\n"
+          )
+          message += XML.XMLError
+          Yast2::Popup.show(message, headline: :error)
+          error = true
+        end
+
+        unless error
+          next if iter == 0
+          xsltret = merge_profiles(base_profile, cleaned_profile, merge_profile)
 
           log.info("Merge result: #{xsltret}")
           if xsltret["exit"] != 0 || xsltret.fetch("stderr", "") != ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-4.0.61/test/AutoInstallRules_test.rb new/autoyast2-4.0.65/test/AutoInstallRules_test.rb
--- old/autoyast2-4.0.61/test/AutoInstallRules_test.rb	2018-08-23 15:55:06.000000000 +0200
+++ new/autoyast2-4.0.65/test/AutoInstallRules_test.rb	2018-10-29 13:46:19.000000000 +0100
@@ -283,8 +283,10 @@
   describe '#Merge' do
     let(:tmp_dir) { File.join(root_path, 'tmp') }
     let(:result_path) { File.join(tmp_dir, 'result.xml') }
+    let(:first_path) { File.join(tmp_dir, 'first.xml') }
     let(:second_path) { File.join(tmp_dir, 'second.xml') }
     let(:base_profile_path) { File.join(tmp_dir, 'base_profile.xml') }
+    let(:cleaned_profile_path) { File.join(tmp_dir, 'current.xml') }
 
     around(:each) do |example|
       FileUtils.rm_rf(tmp_dir) if Dir.exist?(tmp_dir)
@@ -317,12 +319,25 @@
     end
 
     context 'when two XML profiles are given' do
-      it 'merges two XML profiles' do
+      before do
         subject.CreateFile("first.xml")
         subject.CreateFile("second.xml")
-        expect(subject).to receive(:XML_cleanup).at_least(:once).and_return(true)
-        expect(subject).to receive(:merge_profiles).with(base_profile_path,
-          second_path, result_path).and_return({ 'exit' => 0, 'stderr' => '', 'stdout' => '' })
+        allow(subject).to receive(:XML_cleanup).and_return(true)
+      end
+
+      it 'cleans up each profile before merging them' do
+        expect(subject).to receive(:XML_cleanup).with(first_path, base_profile_path)
+          .and_return(true)
+        expect(subject).to receive(:XML_cleanup).with(second_path, cleaned_profile_path)
+          .and_return(true)
+
+        subject.Merge(result_path)
+      end
+
+      it 'merges two XML profiles' do
+        expect(subject).to receive(:merge_profiles)
+          .with(base_profile_path, cleaned_profile_path, result_path)
+          .and_return({ 'exit' => 0, 'stderr' => '', 'stdout' => '' })
         expect(subject.Merge(result_path)).to eq(true)
       end
     end

    