Hello community,

here is the log from the commit of package autoyast2 for openSUSE:Factory 
checked in at 2016-01-23 01:14:55
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old)
 and      /work/SRC/openSUSE:Factory/.autoyast2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "autoyast2"

Changes:
--------
--- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes      2016-01-16 
11:56:45.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2016-01-23 
01:15:31.000000000 +0100
@@ -1,0 +2,20 @@
+Wed Jan 20 16:31:03 CET 2016 - sch...@suse.de
+
+- LVM: taking care about "auto" option --> switching to "max".
+  (bnc#962034)
+- 3.1.113
+
+-------------------------------------------------------------------
+Tue Jan 19 15:19:04 CET 2016 - sch...@suse.de
+
+- Fixed rules.xml : OR operator is interpreted as AND.
+  (bnc#961941)
+- 3.1.112
+
+-------------------------------------------------------------------
+Tue Jan 19 11:40:38 UTC 2016 - igonzalezs...@suse.com
+
+- Fix wrong warning message about the 'init' section
+  not being processed (bsc#962526)
+
+-------------------------------------------------------------------

Old:
----
  autoyast2-3.1.111.tar.bz2

New:
----
  autoyast2-3.1.113.tar.bz2

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

Other differences:
------------------
++++++ autoyast2.spec ++++++
--- /var/tmp/diff_new_pack.jAf9ti/_old  2016-01-23 01:15:32.000000000 +0100
+++ /var/tmp/diff_new_pack.jAf9ti/_new  2016-01-23 01:15:32.000000000 +0100
@@ -17,7 +17,8 @@
 
 
 Name:           autoyast2
-Version:        3.1.111
+
+Version:        3.1.113
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ autoyast2-3.1.111.tar.bz2 -> autoyast2-3.1.113.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/package/autoyast2.changes 
new/autoyast2-3.1.113/package/autoyast2.changes
--- old/autoyast2-3.1.111/package/autoyast2.changes     2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/package/autoyast2.changes     2016-01-21 
10:44:11.000000000 +0100
@@ -1,4 +1,24 @@
 -------------------------------------------------------------------
+Wed Jan 20 16:31:03 CET 2016 - sch...@suse.de
+
+- LVM: taking care about "auto" option --> switching to "max".
+  (bnc#962034)
+- 3.1.113
+
+-------------------------------------------------------------------
+Tue Jan 19 15:19:04 CET 2016 - sch...@suse.de
+
+- Fixed rules.xml : OR operator is interpreted as AND.
+  (bnc#961941)
+- 3.1.112
+
+-------------------------------------------------------------------
+Tue Jan 19 11:40:38 UTC 2016 - igonzalezs...@suse.com
+
+- Fix wrong warning message about the 'init' section
+  not being processed (bsc#962526)
+
+-------------------------------------------------------------------
 Fri Jan 15 10:30:58 CET 2016 - sch...@suse.de
 
 - Installation with "autoyast=default". Fixed nil exception error.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/package/autoyast2.spec 
new/autoyast2-3.1.113/package/autoyast2.spec
--- old/autoyast2-3.1.111/package/autoyast2.spec        2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/package/autoyast2.spec        2016-01-21 
10:44:11.000000000 +0100
@@ -17,7 +17,8 @@
 
 
 Name:           autoyast2
-Version:        3.1.111
+
+Version:        3.1.113
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/AutoInstallRules.rb 
new/autoyast2-3.1.113/src/modules/AutoInstallRules.rb
--- old/autoyast2-3.1.111/src/modules/AutoInstallRules.rb       2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/src/modules/AutoInstallRules.rb       2016-01-21 
10:44:11.000000000 +0100
@@ -466,13 +466,14 @@
          rls.reject! {|r| r=="result"}
          rls.push("result")
        end
+        op = Ops.get_string(ruleset, "operator", "and")
+        rls.reject! {|r| r=="op"}
        Builtins.y2milestone("Orderes Rules: %1", rls)
         Builtins.foreach(rls) do |rule|
          ruledef = ruleset.fetch( rule, {} )
           Builtins.y2milestone("Rule: %1", rule)
           Builtins.y2milestone("Ruledef: %1", ruledef)
           match = Ops.get_string(ruledef, "match", "undefined")
-          op = Ops.get_string(ruledef, "operator", "and")
           matchtype = Ops.get_string(ruledef, "match_type", "exact")
           easy_rules = [
             "hostname",
@@ -822,7 +823,6 @@
           @tomerge
         )
       end
-
       nil
     end
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/AutoinstLVM.rb 
new/autoyast2-3.1.113/src/modules/AutoinstLVM.rb
--- old/autoyast2-3.1.111/src/modules/AutoinstLVM.rb    2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/src/modules/AutoinstLVM.rb    2016-01-21 
10:44:11.000000000 +0100
@@ -403,8 +403,11 @@
                 lv,
                 integer_k
               )
-            elsif Ops.get_string(lv, "size", "") == "max" &&
+            elsif (Ops.get_string(lv, "size", "") == "max" || 
Ops.get_string(lv, "size", "") == "auto") &&
                 Ops.less_or_equal(Ops.get_integer(lv, "stripes", 0), 1)
+              # "auto" size does not make sense here. But we are switching to 
the "max" behaviour in order
+              # not to produce an error and to evaluate other useable 
settings. (bnc#962034)
+              Report.Warning( "Option \"auto\" is not supported with LVM. 
Taking \"max\" option instead.") if lv["size"] == "auto"
               max_counter = Ops.add(max_counter, 1)
             end
             deep_copy(lv)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/src/modules/Profile.rb 
new/autoyast2-3.1.113/src/modules/Profile.rb
--- old/autoyast2-3.1.111/src/modules/Profile.rb        2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/src/modules/Profile.rb        2016-01-21 
10:44:11.000000000 +0100
@@ -21,7 +21,10 @@
       # Flags for setting the solver while the upgrade process with AutoYaST
       "upgrade",
       # Flags for controlling the update backups (see Installation module)
-      "backup"
+      "backup",
+      # init section used by Kickstart and to pass additional arguments
+      # to Linuxrc (bsc#962526)
+      "init"
     ]
 
     # Dropped YaST modules that used to provide AutoYaST functionality
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/autoyast2-3.1.111/test/AutoInstallRules_test.rb 
new/autoyast2-3.1.113/test/AutoInstallRules_test.rb
--- old/autoyast2-3.1.111/test/AutoInstallRules_test.rb 2016-01-15 
12:54:10.000000000 +0100
+++ new/autoyast2-3.1.113/test/AutoInstallRules_test.rb 2016-01-21 
10:44:11.000000000 +0100
@@ -114,6 +114,67 @@
     end
   end
 
+  describe "#Rules XML" do
+    it "Reading rules with -or- operator" do
+      expect(Yast::XML).to receive(:XMLToYCPFile).and_return(
+        { "rules"=>[{
+            "hostaddress"=>{"match"=>"10.69.57.43",
+                            "match_type"=>"exact"},
+            "mac"=>{"match"=>"000c2903d288",
+                    "match_type"=>"exact"},
+            "operator"=>"or",
+            "result"=>{"profile"=>"machine12.xml"}}]
+         }
+      )
+      expect(Yast::SCR).to 
receive(:Execute).with(Yast::Path.new(".target.bash_output"),
+       "if  ( [ \"$hostaddress\" = \"10.69.57.43\" ] )   ||   ( [ \"$mac\" = 
\"000c2903d288\" ] ); then exit 0; else exit 1; fi",
+       {"hostaddress"=>"192.168.1.1", "mac"=>""}
+       )
+      .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""})
+
+      subject.Read
+    end
+
+    it "Reading rules with -and- operator" do
+      expect(Yast::XML).to receive(:XMLToYCPFile).and_return(
+        { "rules"=>[{
+            "hostaddress"=>{"match"=>"10.69.57.43",
+                            "match_type"=>"exact"},
+            "mac"=>{"match"=>"000c2903d288",
+                    "match_type"=>"exact"},
+            "operator"=>"and",
+            "result"=>{"profile"=>"machine12.xml"}}]
+         }
+      )
+      expect(Yast::SCR).to 
receive(:Execute).with(Yast::Path.new(".target.bash_output"),
+       "if  ( [ \"$hostaddress\" = \"10.69.57.43\" ] )   &&   ( [ \"$mac\" = 
\"000c2903d288\" ] ); then exit 0; else exit 1; fi",
+       {"hostaddress"=>"192.168.1.1", "mac"=>""}
+       )
+      .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""})
+
+      subject.Read
+    end
+
+    it "Reading rules with default operator" do
+      expect(Yast::XML).to receive(:XMLToYCPFile).and_return(
+        { "rules"=>[{
+            "hostaddress"=>{"match"=>"10.69.57.43",
+                            "match_type"=>"exact"},
+            "mac"=>{"match"=>"000c2903d288",
+                    "match_type"=>"exact"},
+            "result"=>{"profile"=>"machine12.xml"}}]
+         }
+      )
+      expect(Yast::SCR).to 
receive(:Execute).with(Yast::Path.new(".target.bash_output"),
+       "if  ( [ \"$hostaddress\" = \"10.69.57.43\" ] )   &&   ( [ \"$mac\" = 
\"000c2903d288\" ] ); then exit 0; else exit 1; fi",
+       {"hostaddress"=>"192.168.1.1", "mac"=>""}
+       )
+      .and_return({"stdout"=>"", "exit"=>0, "stderr"=>""})
+
+      subject.Read
+    end
+  end
+
   describe "#Host ID" do
     let(:wicked_output_path) { File.join(root_path, 'test', 'fixtures', 
'output', 'wicked_output')  }
     it "returns host IP in hex format (initial Stage)" do


Reply via email to