Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Tue Feb 24 00:24:01 CET 2009. -------- --- yast2-installation/yast2-installation.changes 2009-02-17 17:03:35.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2009-02-23 17:44:32.000000000 +0100 @@ -1,0 +2,14 @@ +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 Repositories (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 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.18.6.tar.bz2 New: ---- yast2-installation-2.18.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.r14048/_old 2009-02-24 00:20:37.000000000 +0100 +++ /var/tmp/diff_new_pack.r14048/_new 2009-02-24 00:20:37.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.18.6) +# spec file for package yast2-installation (Version 2.18.8) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.18.6 +Version: 2.18.8 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.6.tar.bz2 +Source0: yast2-installation-2.18.8.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # xmllint @@ -123,7 +123,7 @@ Lukas Ocilka <locilka@suse.cz> %prep -%setup -n yast2-installation-2.18.6 +%setup -n yast2-installation-2.18.8 %build %{prefix}/bin/y2tool y2autoconf @@ -194,6 +194,14 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Mon Feb 23 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 Repositories (bnc #478024). +- 2.18.8 +* Fri Feb 20 2009 locilka@suse.cz +- save network configuration also for IPv6 only (bnc#477917) +- 2.18.7 * Tue Feb 17 2009 locilka@suse.cz - Writing additional-control-files index file after removing and recreating the directory where it is stored (bnc #475516). ++++++ yast2-installation-2.18.6.tar.bz2 -> yast2-installation-2.18.8.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.6/src/clients/inst_upgrade_urls.ycp new/yast2-installation-2.18.8/src/clients/inst_upgrade_urls.ycp --- old/yast2-installation-2.18.6/src/clients/inst_upgrade_urls.ycp 2009-01-22 12:42:30.000000000 +0100 +++ new/yast2-installation-2.18.8/src/clients/inst_upgrade_urls.ycp 2009-02-23 17:43:49.000000000 +0100 @@ -534,18 +534,21 @@ integer steps_nr = 0; if (size (sources_to_remove) > 0) { + y2milestone ("Remove %1 repos", sources_to_remove); actions_todo = add (actions_todo, _("Remove unused repositories")); actions_doing = add (actions_doing, _("Removing unused repositories...")); steps_nr = steps_nr + size (sources_to_remove); } if (size (sources_to_add) > 0) { + y2milestone ("Add %1 enabled repos", sources_to_add); actions_todo = add (actions_todo, _("Add enabled repositories")); actions_doing = add (actions_doing, _("Adding enabled repositories...")); steps_nr = steps_nr + size (sources_to_add); } if (size (sources_to_add_disabled) > 0) { + y2milestone ("Add %1 disabled repos", sources_to_add_disabled); actions_todo = add (actions_todo, _("Add disabled repositories")); actions_doing = add (actions_doing, _("Adding disabled repositories...")); steps_nr = steps_nr + size (sources_to_add_disabled); @@ -778,6 +781,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 +801,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 @@ -801,23 +818,29 @@ if (do_not_remove == current_medianr) { y2milestone ("Skipping source: %1 (installation repository)", do_not_remove); + return; } + y2milestone ("Checking repo: %1", one_source); + // Source should be enabled at the end if (one_source["url_will_be_enabled"]:nil == true) { - if (current_medianr == nil) { + //if (current_medianr == nil) { sources_to_add = add (sources_to_add, id); - } + y2milestone ("Source to add: %1", id); + //} // Source should be disabled at the end } else if (one_source["url_will_be_enabled"]:nil == false) { // already registered if (current_medianr != nil) { sources_to_remove = add (sources_to_remove, current_medianr); + y2milestone ("Source to remove: %1", current_medianr); } // will be added sources_to_add_disabled = add (sources_to_add_disabled, id); + y2milestone ("Source to add disabled: %1", id); } }); @@ -825,7 +848,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); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.6/src/inst_finish/network_finish.ycp new/yast2-installation-2.18.8/src/inst_finish/network_finish.ycp --- old/yast2-installation-2.18.6/src/inst_finish/network_finish.ycp 2009-01-22 12:47:16.000000000 +0100 +++ new/yast2-installation-2.18.8/src/inst_finish/network_finish.ycp 2009-02-23 16:35:49.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain@suse.cz> * - * $Id: network_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * $Id: network_finish.ycp 55660 2009-02-20 20:39:50Z mzugec $ * */ @@ -51,7 +51,8 @@ { // if network running, write network configuration - if (NetworkService::isNetworkRunning()) + // also in case of IPv6 (bnc#477917) + if (NetworkService::isNetworkRunning() || NetworkService::isNetworkv6Running()) { y2milestone("Save network configuration"); WFM::CallFunction ("save_network"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-installation-2.18.6/VERSION new/yast2-installation-2.18.8/VERSION --- old/yast2-installation-2.18.6/VERSION 2009-02-17 16:55:55.000000000 +0100 +++ new/yast2-installation-2.18.8/VERSION 2009-02-23 16:41:39.000000000 +0100 @@ -1 +1 @@ -2.18.6 +2.18.8 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org