Mailinglist Archive: yast-commit (595 mails)

[locilka@xxxxxxxxxxxxxxxx]

Author: locilka
Date: Mon Dec  1 17:03:40 2008
New Revision: 53784

URL: http://svn.opensuse.org/viewcvs/yast?rev=53784&view=rev
Log:
- Fixed proposing the online update depending on the fact whether
  network is running (bnc #450229).
- 2.17.43


Modified:
    trunk/installation/VERSION
    trunk/installation/package/yast2-installation.changes
    trunk/installation/src/clients/inst_ask_online_update.ycp

Modified: trunk/installation/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=53784&r1=53783&r2=53784&view=diff
==============================================================================
--- trunk/installation/VERSION (original)
+++ trunk/installation/VERSION Mon Dec  1 17:03:40 2008
@@ -1 +1 @@
-2.17.42
+2.17.43

Modified: trunk/installation/package/yast2-installation.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=53784&r1=53783&r2=53784&view=diff
==============================================================================
--- trunk/installation/package/yast2-installation.changes (original)
+++ trunk/installation/package/yast2-installation.changes Mon Dec  1 17:03:40 
2008
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Mon Dec  1 16:59:14 CET 2008 - locilka@xxxxxxx
+
+- Fixed proposing the online update depending on the fact whether
+  network is running (bnc #450229).
+- 2.17.43
+
+-------------------------------------------------------------------
 Fri Nov 28 15:05:02 CET 2008 - locilka@xxxxxxx
 
 - Updated labels of Installation Scenarios for SLES (bnc #428202).

Modified: trunk/installation/src/clients/inst_ask_online_update.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ask_online_update.ycp?rev=53784&r1=53783&r2=53784&view=diff
==============================================================================
--- trunk/installation/src/clients/inst_ask_online_update.ycp (original)
+++ trunk/installation/src/clients/inst_ask_online_update.ycp Mon Dec  1 
17:03:40 2008
@@ -25,8 +25,14 @@
     import "Label";
     import "Internet";
     import "Installation";
+    import "NetworkService";
 
-    if (!Internet::do_you) return `auto;
+    // BNC #450229
+    // There used to be >if (!Internet::do_you)<
+    if (NetworkService::isNetworkRunning() != true) {
+       y2milestone ("No network running, skipping online update...");
+       return `auto;
+    }
 
     map ui = UI::GetDisplayInfo();
 
@@ -106,17 +112,17 @@
         }
         else if ( ret == `next )
         {
-            if ( (boolean) UI::QueryWidget(`id(`noupdate), `Value) )
-                ret = `skip;
+           // Skipping online update
+            if ((boolean) UI::QueryWidget(`id(`noupdate), `Value)) {
+               Internet::do_you = false;
+           } else {
+               // needed later
+               // BNC #450229
+               Internet::do_you = true;
+           }
         }
 
-    } until ( ret == `next || ret == `back || ret == `skip);
-
-    if ( ret == `skip )
-    {
-        Internet::do_you = false;
-        ret = `next;
-    }
+    } until ( ret == `next || ret == `back );
 
     return (symbol)ret;
 }

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx