Author: locilka Date: Tue Apr 22 12:33:23 2008 New Revision: 46943 URL: http://svn.opensuse.org/viewcvs/yast?rev=46943&view=rev Log: - Fixed filtering-out already registered repos (bnc #379051). 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-installation.changes?rev=46943&r1=46942&r2=46943&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Tue Apr 22 12:33:23 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Apr 22 12:26:52 CEST 2008 - locilka@suse.cz + +- Fixed filtering-out already registered repos (bnc #379051). + +------------------------------------------------------------------- Mon Apr 21 15:28:24 CEST 2008 - locilka@suse.cz - Calling 'xset r off' & 'xset m 1' (bnc #376945). 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=46943&r1=46942&r2=46943&view=diff ============================================================================== --- trunk/installation/src/clients/inst_upgrade_urls.ycp (original) +++ trunk/installation/src/clients/inst_upgrade_urls.ycp Tue Apr 22 12:33:23 2008 @@ -127,14 +127,14 @@ ), [] ), - `HBox ( + `Left (`HBox ( // TRANSLATORS: Push button `PushButton (`id (`edit), _("&Change...")), `HSpacing (1), // TRANSLATORS: Push button `PushButton (`id (`toggle), _("&Toggle Status")), `HStretch() - ) + )) ), // TRANSLATORS: help text 1/3 _("<p>Here you see all software repositories found @@ -178,6 +178,10 @@ if (currentitem != nil) { UI::ChangeWidget (`id ("table_of_repos"), `CurrentItem, currentitem); } + + boolean enable_buttons = (size (items) > 0); + UI::ChangeWidget (`id (`edit), `Enabled, enable_buttons); + UI::ChangeWidget (`id (`toggle), `Enabled, enable_buttons); } boolean FindCurrentURLStatus (string baseurl) { @@ -340,12 +344,14 @@ // All already registered repos foreach (map one_registered_repo, already_registered_repos, { // if an installation repository is enabled, skip it - if (one_registered_repo["enabled"]:true == false) + if (one_registered_repo["enabled"]:true == false) { + y2milestone ("Repo %1 is not enabled, skipping", one_registered_repo["url"]:one_registered_repo["media"]:nil); return; + } string registered_url = one_registered_repo["url"]:"-A-"; string registered_name = one_registered_repo["name"]:"-A-"; - string registered_dir = one_registered_repo["product_dir"]:"-A-"; + string registered_dir = one_registered_repo["path"]:"/"; // Remove them from repos being offered to user to enable/disable them // Don't handle them at all, they have to stay untouched @@ -353,13 +359,13 @@ urls = filter (map one_from_urls, urls, { string one_url = one_from_urls["url"]:"-B-"; string one_name = one_from_urls["name"]:"-B-"; - string one_dir = one_from_urls["product_dir"]:"-B-"; + string one_dir = one_from_urls["path"]:"/"; if (registered_url == one_url && registered_name == one_name && registered_dir == one_dir) { y2milestone ("The same product (url) already in use, not handling it %1", one_registered_repo); - return true; - } else { return false; + } else { + return true; } }); }); @@ -614,7 +620,7 @@ "media_url" : one_url, "product_dir" : pth, "product" : repo_name, - "autoyast_product" : "", + "autoyast_product" : repo_name, ]); } }); @@ -721,18 +727,20 @@ Progress::NextStage(); Progress::Finish(); - if (size (already_registered_repos) < 1) { + if (already_registered_repos == nil || size (already_registered_repos) < 1) { + y2milestone ("No sources found"); + continue_processing = false; + } else if (urls == nil || size (urls) < 1) { + y2milestone ("No sources to offer"); continue_processing = false; } - if (! continue_processing) { - y2milestone ("No sources found"); - return ret; + if (continue_processing) { + ret = HandleOldSources(); + if (ret == `next) + ret = AddOrRemoveSources(); } - ret = HandleOldSources(); - if (ret == `next) ret = AddOrRemoveSources(); - // for testing purpose if (Mode::normal()) { if (ret == `next) Pkg::SourceSaveAll(); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org