[yast-commit] r51072 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_upgrade_urls.ycp
![](https://seccdn.libravatar.org/avatar/2e1a2d7374f0eeb790839676bdd1123a.jpg?s=120&d=mm&r=g)
Author: locilka Date: Fri Sep 12 10:36:32 2008 New Revision: 51072 URL: http://svn.opensuse.org/viewcvs/yast?rev=51072&view=rev Log: - Do not remove installation repository with the same URL as URL just being removed by inst_upgrade_urls (bnc #400823). - 2.17.11 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=51072&r1=51071&r2=51072&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri Sep 12 10:36:32 2008 @@ -1 +1 @@ -2.17.10 +2.17.11 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=51072&r1=51071&r2=51072&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri Sep 12 10:36:32 2008 @@ -1,9 +1,15 @@ ------------------------------------------------------------------- +Fri Sep 12 10:32:11 CEST 2008 - locilka@suse.cz + +- Do not remove installation repository with the same URL as URL + just being removed by inst_upgrade_urls (bnc #400823). +- 2.17.11 + +------------------------------------------------------------------- Thu Sep 11 14:52:25 CEST 2008 - ug@suse.de - deploy_image.desktop added (Fate #301321) - deploy_image.rnc added -- 2.17.11 ------------------------------------------------------------------- Thu Sep 11 13:40:10 CEST 2008 - 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=51072&r1=51071&r2=51072&view=diff ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Fri Sep 12 10:36:32 2008 @@ -228,24 +228,6 @@ return ret; } - integer FindURLMediaNr (string baseurl) { - if (baseurl == "" || baseurl == nil) { - y2error ("Base URL not defined!"); - return nil; - } - - integer ret = nil; - - foreach (map one_url, already_registered_repos, { - if (baseurl == one_url["url"]:"-A-") { - ret = one_url["media"]:-1; - break; - } - }); - - return ret; - } - string FindURLName (string id) { if (id == "" || id == nil) { y2error ("Base URL not defined!"); @@ -320,7 +302,6 @@ // If some new (since 10.3 Alpha?) URLs found, use only them if (new_urls != nil && new_urls != []) { foreach (map one_url_map, new_urls, { - // bnc #300901 boolean enabled = nil; @@ -382,9 +363,13 @@ urls = old_urls; } + integer id = -1; + urls = maplist (map one_url, urls, { + id = id + 1; + // unique ID - one_url["id"] = one_url["id"]:one_url["url"]:""; + one_url["id"] = sformat ("ID: %1", id); one_url["url_will_be_enabled"] = FindCurrentURLStatus (tostring (one_url["url"]:"")); one_url["initial_url_status"] = one_url["url_will_be_enabled"]:false; @@ -635,7 +620,7 @@ Progress::NextStep (); Pkg::SourceDelete (one_id); - AddOnProduct::add_on_products = (list
participants (1)
-
locilka@svn.opensuse.org