February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55695 - /tags/stable-2_18_8/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:51:32 2009 New Revision: 55695 URL: http://svn.opensuse.org/viewcvs/yast?rev=55695&view=rev Log: Created tag stable-2_18_8 for installation Added: tags/stable-2_18_8/installation/ - copied from r55694, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55694 - /tags/branch-Code-11-2_17_54/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:47:02 2009 New Revision: 55694 URL: http://svn.opensuse.org/viewcvs/yast?rev=55694&view=rev Log: Created tag branch-Code-11-2_17_54 for installation Added: tags/branch-Code-11-2_17_54/installation/ - copied from r55693, branches/SuSE-Code-11-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55693 - /tags/stable-2_18_8/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:46:34 2009 New Revision: 55693 URL: http://svn.opensuse.org/viewcvs/yast?rev=55693&view=rev Log: A better patch, this one works Removed: tags/stable-2_18_8/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55692 - /tags/branch-Code-11-2_17_54/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:46:01 2009 New Revision: 55692 URL: http://svn.opensuse.org/viewcvs/yast?rev=55692&view=rev Log: A working patch Removed: tags/branch-Code-11-2_17_54/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55691 - in /trunk/installation: package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:45:15 2009 New Revision: 55691 URL: http://svn.opensuse.org/viewcvs/yast?rev=55691&view=rev Log: Due to changes in libzypp? package-bindings? repositories were newer saved/eanbled. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_upgrade_urls.ycp Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Feb 23 17:45:15 2009 @@ -3,7 +3,7 @@ - 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). + and comes from the Online Repositories (bnc #478024). - 2.18.8 ------------------------------------------------------------------- Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Mon Feb 23 17:45:15 2009 @@ -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); @@ -815,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); } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55690 - in /branches/SuSE-Code-11-Branch/installation: package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 17:45:07 2009 New Revision: 55690 URL: http://svn.opensuse.org/viewcvs/yast?rev=55690&view=rev Log: Due to changes in libzypp? package-bindings? repositories were newer saved/eanbled. Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Mon Feb 23 17:45:07 2009 @@ -3,7 +3,7 @@ - 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). + and comes from the Online Repositories (bnc #478024). - 2.17.54 ------------------------------------------------------------------- Modified: branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp Mon Feb 23 17:45:07 2009 @@ -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); @@ -815,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); } }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55689 - /tags/stable-2_18_8/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 16:43:55 2009 New Revision: 55689 URL: http://svn.opensuse.org/viewcvs/yast?rev=55689&view=rev Log: Created tag stable-2_18_8 for installation Added: tags/stable-2_18_8/installation/ - copied from r55688, trunk/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55688 - /tags/branch-Code-11-2_17_54/installation/
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 16:42:37 2009 New Revision: 55688 URL: http://svn.opensuse.org/viewcvs/yast?rev=55688&view=rev Log: Created tag branch-Code-11-2_17_54 for installation Added: tags/branch-Code-11-2_17_54/installation/ - copied from r55687, branches/SuSE-Code-11-Branch/installation/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55687 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

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&r… ============================================================================== --- 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-insta… ============================================================================== --- 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(a)suse.cz - -- save network configuration also for IPv6 only (bnc#477917) -- 2.18.7 - +------------------------------------------------------------------- +Mon Feb 23 16:36:56 CET 2009 - locilka(a)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(a)suse.cz + +- save network configuration also for IPv6 only (bnc#477917) +- 2.18.7 + ------------------------------------------------------------------- Tue Feb 17 16:56:09 CET 2009 - locilka(a)suse.cz Modified: trunk/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_up… ============================================================================== --- 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55686 - in /branches/SuSE-Code-11-Branch/installation: VERSION package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
by locilka＠svn.opensuse.org 23 Feb '09

23 Feb '09

Author: locilka Date: Mon Feb 23 16:41:13 2009 New Revision: 55686 URL: http://svn.opensuse.org/viewcvs/yast?rev=55686&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.17.54 Modified: branches/SuSE-Code-11-Branch/installation/VERSION branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp Modified: branches/SuSE-Code-11-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-Branch/installation/VERSION Mon Feb 23 16:41:13 2009 @@ -1 +1 @@ -2.17.53 +2.17.54 Modified: branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-Branch/installation/package/yast2-installation.changes Mon Feb 23 16:41:13 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Feb 23 16:36:56 CET 2009 - locilka(a)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.17.54 + +------------------------------------------------------------------- Fri Feb 20 20:40:09 CET 2009 - locilka(a)suse.cz - save network configuration also for IPv6 only (bnc#477917) Modified: branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/installat… ============================================================================== --- branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp (original) +++ branches/SuSE-Code-11-Branch/installation/src/clients/inst_upgrade_urls.ycp Mon Feb 23 16:41:13 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(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0