Author: locilka Date: Mon Feb 23 16:41:37 2009 New Revision: 55687 URL: http://svn.opensuse.org/viewcvs/yast?rev=55687&view=rev Log: - Offering to configure network if remote repositories are used during upgrade (inst_upgrade_urls). Setup can be safely skipped and comes from the Online Repositopries (bnc #478024). - 2.18.8 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=55687&r1=55686&r2=55687&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Feb 23 16:41:37 2009 @@ -1 +1 @@ -2.18.7 +2.18.8 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=55687&r1=55686&r2=55687&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 23 16:41:37 2009 @@ -1,9 +1,17 @@ -------------------------------------------------------------------- -Fri Feb 20 20:40:09 CET 2009 - locilka@suse.cz - -- save network configuration also for IPv6 only (bnc#477917) -- 2.18.7 - +------------------------------------------------------------------- +Mon Feb 23 16:36:56 CET 2009 - locilka@suse.cz + +- Offering to configure network if remote repositories are used + during upgrade (inst_upgrade_urls). Setup can be safely skipped + and comes from the Online Repositopries (bnc #478024). +- 2.18.8 + +------------------------------------------------------------------- +Fri Feb 20 20:40:09 CET 2009 - locilka@suse.cz + +- save network configuration also for IPv6 only (bnc#477917) +- 2.18.7 + ------------------------------------------------------------------- Tue Feb 17 16:56:09 CET 2009 - locilka@suse.cz Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_upgrade_urls.ycp?rev=55687&r1=55686&r2=55687&view=diff ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Mon Feb 23 16:41:37 2009 @@ -778,6 +778,14 @@ }); } + boolean SourceIsRemote (string url) { + if (regexpmatch (url, "^cd://")) return false; + if (regexpmatch (url, "^dvd://")) return false; + if (regexpmatch (url, "^disk://")) return false; + + return true; + } + symbol AddOrRemoveSources () { list <integer> sources_to_remove = []; list <string> sources_to_add = []; @@ -790,10 +798,16 @@ // bnc #400823 do_not_remove = Pkg::SourceGetCurrent(false)[0]:0; + boolean some_sources_are_remote = false; + foreach (map one_source, urls, { string url = one_source["url"]:""; string id = one_source["id"]:""; + if (SourceIsRemote (url)) { + some_sources_are_remote = true; + } + id_to_url[id] = url; // bnc #400823 @@ -825,7 +839,15 @@ SetAddRemoveSourcesUI(); } - // Remote repositories need network + // BNC #478024: Remote repositories need a running network + if ((size (sources_to_add) > 0) && ! NetworkRunning()) { + y2milestone ("No network is running, trying inst_network_check fallback"); + any ret = WFM::CallFunction ("inst_network_check", []); + y2milestone ("Called inst_network_check returned: %1", ret); + } + + // Remote repositories without running network are registered + // as disabled if ((size (sources_to_add) > 0) && ! NetworkRunning()) { y2warning ("Network is not running, sources will be added in DISABLED state"); sources_to_add_disabled = (list <string>) union (sources_to_add_disabled, sources_to_add); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org