Author: locilka Date: Fri Apr 3 14:35:02 2009 New Revision: 56621 URL: http://svn.opensuse.org/viewcvs/yast?rev=56621&view=rev Log: - Adjusting initial repository name according to LABEL in content file (bnc #481828). - 2.18.4 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp trunk/add-on/yast2-add-on.spec.in Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=56621&r1=56620&r2=56621&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Apr 3 14:35:02 2009 @@ -1 +1 @@ -2.18.3 +2.18.4 Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.changes?rev=56621&r1=56620&r2=56621&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Apr 3 14:35:02 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Apr 3 14:34:11 CEST 2009 - locilka@suse.cz + +- Adjusting initial repository name according to LABEL in content + file (bnc #481828). +- 2.18.4 + +------------------------------------------------------------------- Wed Mar 18 17:59:31 CET 2009 - locilka@suse.cz - Removing a work around that broke the possibility to use several Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?rev=56621&r1=56620&r2=56621&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Apr 3 14:35:02 2009 @@ -10,6 +10,7 @@ * * Authors: * Jiri Srain <jsrain@suse.cz> + * Lukas Ocilka <locilka@suse.cz> * * */ @@ -34,6 +35,7 @@ import "Installation"; import "PackageCallbacks"; import "PackagesUI"; +import "Packages"; include "packager/inst_source_dialogs.ycp"; include "packager/repositories_include.ycp"; @@ -195,6 +197,8 @@ }); if (src_id_found) { + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (AddOnProduct::src_id); // used add-ons are stored in a special list AddAddOnToStore (AddOnProduct::src_id); } else { @@ -286,14 +290,9 @@ // busy message UI::OpenDialog(`Label(`id (`add_on_popup_id), _("Initializing new source..."))); integer src_id = SourceManager::newSources[0]:0; - map data = Pkg::SourceGeneralData (src_id); - y2milestone("Adding product: %1", data); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", src_id); - Pkg::SourceDelete (src_id); - src_id = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [src_id]; + + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (src_id); // a little hack because of packager leaving // windows open... @@ -309,16 +308,6 @@ } } - if (src_id == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (src_id); - - y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); - return `finish; - } - AddOnProduct::src_id = src_id; SourceManager::newSources = [src_id]; y2milestone ("Only one source available - skipping dialog"); @@ -326,6 +315,7 @@ y2milestone ("CatalogSelect Dialog ret: %1", AddOnProduct::last_ret); return AddOnProduct::last_ret; } + y2milestone ("Running catalog select dialog"); list catalogs = maplist (integer src, sources, { map data = Pkg::SourceGeneralData (src); @@ -360,17 +350,8 @@ if (ret == `abort || ret == `cancel) { ret = `abort; -// if (Stage::initial()) -// { -// if (Popup::ConfirmAbort (`painless)) -// break; -// } -// else -// { - // yes-no popup - if (Popup::YesNo (_("Really abort add-on product installation?"))) - break; -// } + if (Popup::YesNo (_("Really abort add-on product installation?"))) + break; continue; } else if (ret == `back) @@ -401,26 +382,13 @@ foreach (integer src, SourceManager::newSources, { if (src != selected) { - y2milestone ("Deleting source %1", src); + y2milestone ("Deleting unused source %1", src); Pkg::SourceDelete (src); } }); - map data = Pkg::SourceGeneralData (selected); - string url = data["url"]:""; - string product_dir = data["product_dir"]:""; - y2milestone ("Deleting source %1", selected); - Pkg::SourceDelete (selected); - selected = Pkg::SourceCreate (url, product_dir); - SourceManager::newSources = [selected]; - if (selected == -1) - { - // error report - Report::Error (_("Failed to initialize the software repository.")); - AddOnProduct::ClearRegistrationRequest (selected); - y2milestone ("CatalogSelect Dialog ret: %1", `finish); - return `finish; - } + // BNC #481828: Using LABEL from content file as a repository name + Packages::AdjustSourcePropertiesAccordingToProduct (selected); AddOnProduct::src_id = selected; SourceManager::newSources = [selected]; Modified: trunk/add-on/yast2-add-on.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/yast2-add-on.spec.in?rev=56621&r1=56620&r2=56621&view=diff ============================================================================== --- trunk/add-on/yast2-add-on.spec.in (original) +++ trunk/add-on/yast2-add-on.spec.in Fri Apr 3 14:35:02 2009 @@ -7,8 +7,8 @@ Requires: yast2-installation Requires: yast2-country -# repositories_include.ycp -Requires: yast2-packager >= 2.16.47 +# Packages::AdjustSourcePropertiesAccordingToProduct +Requires: yast2-packager >= 2.18.4 # bugzilla #335582, new API for StorageDevices Requires: yast2-storage >= 2.16.1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org