[yast-commit] [ci_new_pac] JFYI yast2-network -> sle12

12 Mar 2014

Script 'mail_helper' called by ro
Hello packager,

This is just FYI.  Your package was checked in in distribution "sle12"
by autobuild-member: ro.

Here comes the log...

---------------------------%<------------------------------
Hi,

here is the log from ci_new_pac /mounts/work_src_done/SLE12/yast2-network -> sle12



## BNC# 866827 : "Unable to specify a static IP address when installing SLES12 beta1" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2-network/yast2-network.changes	2014-03-10 16:13:04.000000000 +0100
+++ /mounts/work_src_done/SLE12/yast2-network/yast2-network.changes	2014-03-12 10:34:05.000000000 +0100
@@ -1,0 +2,8 @@
+Wed Mar 12 08:01:43 UTC 2014 - mfilka@suse.com
+
+- bnc#866827, fate#314695
+  - show a dialog for network configuration when autoconfiguration
+  is unable to proceed
+- 3.1.33
+
+-------------------------------------------------------------------

calling whatdependson for sle12-i586
Packages directly triggered for rebuild:
- yast2-network
- at least 15 other packages
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/SUSE:SLE-12:GA/yast2-network (Old)
 and      /mounts/work_src_done/SLE12/yast2-network (BS:build ID:34231 MAIL:yast-commit@opensuse.org) (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-network", Maintainer is "yast-commit@opensuse.org"


Old:
----
  yast2-network-3.1.32.tar.bz2

New:
----
  yast2-network-3.1.33.tar.bz2

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

Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.TF30qV/_old	2014-03-12 16:59:25.000000000 +0100
+++ /var/tmp/diff_new_pack.TF30qV/_new	2014-03-12 16:59:25.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.32
+Version:        3.1.33
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-network-3.1.32.tar.bz2 -> yast2-network-3.1.33.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/package/yast2-network.changes new/yast2-network-3.1.33/package/yast2-network.changes
--- old/yast2-network-3.1.32/package/yast2-network.changes	2014-03-10 14:45:23.000000000 +0100
+++ new/yast2-network-3.1.33/package/yast2-network.changes	2014-03-12 10:29:53.000000000 +0100
@@ -1,4 +1,12 @@
 -------------------------------------------------------------------
+Wed Mar 12 08:01:43 UTC 2014 - mfilka@suse.com
+
+- bnc#866827, fate#314695
+  - show a dialog for network configuration when autoconfiguration
+  is unable to proceed
+- 3.1.33
+
+-------------------------------------------------------------------
 Mon Mar 10 10:54:18 CET 2014 - locilka@suse.com
 
 - Fixed Yast Remote to allow enabling vnc-httpd and vnc-server
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/package/yast2-network.spec new/yast2-network-3.1.33/package/yast2-network.spec
--- old/yast2-network-3.1.32/package/yast2-network.spec	2014-03-10 14:45:23.000000000 +0100
+++ new/yast2-network-3.1.33/package/yast2-network.spec	2014-03-12 10:29:53.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.1.32
+Version:        3.1.33
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/src/clients/inst_lan.rb new/yast2-network-3.1.33/src/clients/inst_lan.rb
--- old/yast2-network-3.1.32/src/clients/inst_lan.rb	2014-03-10 14:45:23.000000000 +0100
+++ new/yast2-network-3.1.33/src/clients/inst_lan.rb	2014-03-12 10:29:53.000000000 +0100
@@ -31,38 +31,38 @@
 # Uses all other files.
 module Yast
   class InstLanClient < Client
+    include Logger
+
     def main
       Yast.import "UI"
-
-      #**
-      # <h3>Network configuration</h3>
-
-      textdomain "network"
-
-      # The main ()
-      Builtins.y2milestone("----------------------------------------")
-      Builtins.y2milestone("Lan module started")
-
       Yast.import "Label"
       Yast.import "Lan"
       Yast.import "RichText"
 
+      textdomain "network"
+
+      log.info("----------------------------------------")
+      log.info("Lan module started")
+
       Yast.include self, "network/lan/cmdline.rb"
       Yast.include self, "network/lan/wizards.rb"
 
-      @ret = LanSequence()
-
-      Builtins.y2internal("Network inst ret = %1", @ret)
-      Builtins.y2debug("ret=%1", @ret)
+      ret = LanSequence()
 
-      # Finish
-      Builtins.y2milestone("Lan module finished")
-      Builtins.y2milestone("----------------------------------------")
+      log.info("Lan module finished, ret = #{ret}")
+      log.info("----------------------------------------")
 
-      deep_copy(@ret) 
-      # EOF
+      ret
     end
   end
-end
 
-Yast::InstLanClient.new.main
+  conf_net = LanItems.Items.keys.any? { |i| LanItems.IsItemConfigured(i) }
+
+  log.info("Configured network found: #{conf_net}")
+
+  if !conf_net
+    Yast::InstLanClient.new.main
+  else
+    :next
+  end
+end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/src/modules/LanItems.rb new/yast2-network-3.1.33/src/modules/LanItems.rb
--- old/yast2-network-3.1.32/src/modules/LanItems.rb	2014-03-10 14:45:24.000000000 +0100
+++ new/yast2-network-3.1.33/src/modules/LanItems.rb	2014-03-12 10:29:53.000000000 +0100
@@ -28,6 +28,8 @@
     attr_reader :ipoib_modes
     attr_accessor :ipoib_mode
 
+    include Logger
+
     def main
       Yast.import "UI"
       textdomain "network"
@@ -306,18 +308,10 @@
     # Returns true if the item (see LanItems::Items) has
     # netconfig configuration.
     def IsItemConfigured(itemId)
-      ret = false
-
-      if Ops.greater_than(
-          Builtins.size(Ops.get_string(GetLanItem(itemId), "ifcfg", "")),
-          0
-        )
-        ret = true
-      end
-
-      Builtins.y2milestone("is item %1 configured? %2", itemId, ret)
+      ret = !GetLanItem(itemId)["ifcfg"].to_s.empty?
+      log.info("IsItemConfigured: item=#{itemId} configured=#{ret}")
 
-      ret
+      return ret
     end
 
     # Returns true if current (see LanItems::current) has
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/test/Makefile.am new/yast2-network-3.1.33/test/Makefile.am
--- old/yast2-network-3.1.32/test/Makefile.am	2014-03-10 14:45:24.000000000 +0100
+++ new/yast2-network-3.1.33/test/Makefile.am	2014-03-12 10:29:53.000000000 +0100
@@ -6,7 +6,8 @@
   routing_test.rb \
   new_device_startmode_test.rb \
   widgets_test.rb \
-  install_inf_convertor_test.rb
+  install_inf_convertor_test.rb \
+  lan_items_helpers_test.rb
 
 TEST_EXTENSIONS = .rb
 RB_LOG_COMPILER = rspec
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-3.1.32/test/lan_items_helpers_test.rb new/yast2-network-3.1.33/test/lan_items_helpers_test.rb
--- old/yast2-network-3.1.32/test/lan_items_helpers_test.rb	1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-network-3.1.33/test/lan_items_helpers_test.rb	2014-03-12 10:29:53.000000000 +0100
@@ -0,0 +1,28 @@
+#!/usr/bin/env rspec
+
+ENV["Y2DIR"] = File.expand_path("../../src", __FILE__)
+
+require "yast"
+
+Yast.import "LanItems"
+
+describe "LanItemsClass#IsItemConfigured" do
+
+  it "succeeds when item has configuration" do
+    Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => "enp0s3" } }
+
+    expect(Yast::LanItems.IsItemConfigured(0)).to be_true
+  end
+
+  it "fails when item doesn't exist" do
+    Yast::LanItems.stub(:GetLanItem) { {} }
+
+    expect(Yast::LanItems.IsItemConfigured(0)).to be_false
+  end
+
+  it "fails when item's configuration doesn't exist" do
+    Yast::LanItems.stub(:GetLanItem) { { "ifcfg" => nil } }
+
+    expect(Yast::LanItems.IsItemConfigured(0)).to be_false
+  end
+end

continue with "q"...


Checked in at Wed Mar 12 16:59:36 CET 2014 by ro

Remember to have fun...

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org

    

ro

tags

participants (1)