Attachment 257001 Details for Bug 450229

Patch proposal version 3

inst_ask_online_update.ycp.diff (text/plain), 1.24 KB, created by Lukas Ocilka on 2008-12-01 15:58:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Ocilka

Created: 2008-12-01 15:58:58 UTC

Size: 1.24 KB

patch

obsolete

>Index: inst_ask_online_update.ycp
>===================================================================
>--- inst_ask_online_update.ycp	(revision 53761)
>+++ inst_ask_online_update.ycp	(working copy)
>@@ -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);
>+    } until ( ret == `next || ret == `back );
> 
>-    if ( ret == `skip )
>-    {
>-        Internet::do_you = false;
>-        ret = `next;
>-    }
>-
>     return (symbol)ret;
> }

Actions: View

Attachments on bug 450229: 256728 | 256991 | 256995 | 256998 | 257001 | 257759