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

30 May 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 -> sle12



## BNC# 879594 : "Network cannot be configured when starting upgrade from SLED11SP3 to SLED12" (RESOLVED/FIXED)

Changes:
--------

--- /work/SRC/SUSE:SLE-12:GA/yast2/yast2.changes	2014-05-28 17:26:00.000000000 +0200
+++ /mounts/work_src_done/SLE12/yast2/yast2.changes	2014-05-30 10:58:58.000000000 +0200
@@ -1,0 +2,7 @@
+Fri May 30 10:41:14 CEST 2014 - locilka@suse.com
+
+- Fixed network backend handling during upgrade - unified with
+  installation (bnc#879594)
+- 3.1.72
+
+-------------------------------------------------------------------

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

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


Old:
----
  yast2-3.1.71.tar.bz2

New:
----
  yast2-3.1.72.tar.bz2

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

Other differences:
------------------
++++++ yast2.spec ++++++
--- /var/tmp/diff_new_pack.BBVVT6/_old	2014-05-30 12:15:28.000000000 +0200
+++ /var/tmp/diff_new_pack.BBVVT6/_new	2014-05-30 12:15:28.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.71
+Version:        3.1.72
 Release:        0
 URL:            https://github.com/yast/yast-yast2
 

++++++ yast2-3.1.71.tar.bz2 -> yast2-3.1.72.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.71/library/network/src/modules/NetworkService.rb new/yast2-3.1.72/library/network/src/modules/NetworkService.rb
--- old/yast2-3.1.71/library/network/src/modules/NetworkService.rb	2014-05-28 14:25:30.000000000 +0200
+++ new/yast2-3.1.72/library/network/src/modules/NetworkService.rb	2014-05-30 10:50:27.000000000 +0200
@@ -71,11 +71,16 @@
 
     WICKED = "/usr/sbin/wicked"
 
+    DEFAULT_BACKEND = :wicked
+
+    include Yast::Logger
+
     def main
       Yast.import "Service"
       Yast.import "NetworkConfig"
       Yast.import "Popup"
       Yast.import "Mode"
+      Yast.import "Stage"
       Yast.import "PackageSystem"
 
       textdomain "base"
@@ -179,18 +184,21 @@
           when "wicked"
             @current_name = :wicked
           else
-            if running_installer?
-              Builtins.y2milestone("Running in installer, use default: wicked")
-              @current_name = :wicked
+            if Stage.initial
+              @current_name = DEFAULT_BACKEND
+              log.info "Running in installer, use default: #{@current_name}"
+            elsif Mode.config
+              @current_name = DEFAULT_BACKEND
+              log.info "Running in AutoYast config, use default: #{@current_name}"
             else
-              Builtins.y2error("Cannot determine used network service.")
+              log.info "Cannot determine used network service."
               raise "Cannot detect used network service"
             end
         end
 
         @cached_name = @current_name
 
-        Builtins.y2milestone("Current backend: #{@current_name}")
+        log.info "Current backend: #{@current_name}"
       end
       @initialized = true
 
@@ -247,7 +255,7 @@
 
     # Reload or restars the network service.
     def ReloadOrRestart
-      if Mode.installation
+      if Stage.initial
         # inst-sys is not running systemd nor sysV init, so systemctl call
         # is not available and service has to be restarted directly
         wicked_restart
@@ -258,7 +266,7 @@
 
     # Restarts the network service
     def Restart
-      if Mode.installation
+      if Stage.initial
         wicked_restart
       else
         systemctl_restart
@@ -342,25 +350,33 @@
     end
 
     # If there is network running, return true.
-    # Otherwise show error popup depending on Mode and return false
+    # Otherwise show error popup depending on Stage and return false
     # @return true if network running
     def RunningNetworkPopup
-      Builtins.y2internal("RunningNetworkPopup %1", isNetworkRunning)
-      if isNetworkRunning
+      network_running = isNetworkRunning
+
+      log.info "RunningNetworkPopup #{network_running}"
+
+      if network_running
         return true
       else
-        error_text = Builtins.sformat(
-          "%1\n%2 %3",
-          _("No running network detected."),
-          Mode.installation ?
-            _("Restart installation and configure network in Linuxrc") :
-            _(
-              "Configure network with YaST or Network Manager plug-in\nand start this module again"
-            ),
-          _("or continue without network.")
-        )
+        error_text = Stage.initial ?
+          _(
+            "No running network detected.\n" +
+            "Restart installation and configure network in Linuxrc\n" +
+            "or continue without network."
+          )
+          :
+          _(
+            "No running network detected.\n" +
+            "Configure network with YaST or Network Manager plug-in\n" +
+            "and start this module again\n" +
+            "or continue without network."
+          )
+
         ret = Popup.ContinueCancel(error_text)
-        Builtins.y2error("Network not runing!")
+
+        log.error "Network not runing!"
         return ret
       end
     end
@@ -420,11 +436,6 @@
       nil
     end
 
-    # Check if currently runs in installer
-    def running_installer?
-      Mode.installation || Mode.config || Mode.update
-    end
-
     publish :function => :Read, :type => "void ()"
     publish :function => :Modified, :type => "boolean ()"
     publish :function => :is_backend_available, :type => "boolean (symbol)"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.71/package/yast2.changes new/yast2-3.1.72/package/yast2.changes
--- old/yast2-3.1.71/package/yast2.changes	2014-05-28 14:25:30.000000000 +0200
+++ new/yast2-3.1.72/package/yast2.changes	2014-05-30 10:50:28.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Fri May 30 10:41:14 CEST 2014 - locilka@suse.com
+
+- Fixed network backend handling during upgrade - unified with
+  installation (bnc#879594)
+- 3.1.72
+
+-------------------------------------------------------------------
 Wed May 28 10:55:02 UTC 2014 - locilka@suse.com
 
 - Removed warning message when starting Yast in Qt instead of GTK
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-3.1.71/package/yast2.spec new/yast2-3.1.72/package/yast2.spec
--- old/yast2-3.1.71/package/yast2.spec	2014-05-28 14:25:30.000000000 +0200
+++ new/yast2-3.1.72/package/yast2.spec	2014-05-30 10:50:28.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.71
+Version:        3.1.72
 Release:        0
 URL:            https://github.com/yast/yast-yast2
 

continue with "q"...


Checked in at Fri May 30 12:15:37 CEST 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)