Author: locilka Date: Thu Apr 2 14:20:08 2009 New Revision: 56577 URL: http://svn.opensuse.org/viewcvs/yast?rev=56577&view=rev Log: - Removing a work around that broke the possibility to use several add-ons with the same URL (especially physical media-based ones) (bnc #475352). - 2.13.214 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp Modified: branches/SuSE-SLE-10-SP3-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/VERSION?rev=56577&r1=56576&r2=56577&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/VERSION Thu Apr 2 14:20:08 2009 @@ -1 +1 @@ -2.13.213 +2.13.214 Modified: branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes?rev=56577&r1=56576&r2=56577&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/package/yast2-installation.changes Thu Apr 2 14:20:08 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Apr 2 14:19:38 CEST 2009 - locilka@suse.cz + +- Removing a work around that broke the possibility to use several + add-ons with the same URL (especially physical media-based ones) + (bnc #475352). +- 2.13.214 + +------------------------------------------------------------------- Wed Apr 1 11:41:24 CEST 2009 - lslezak@suse.cz - do not log password in URL into y2log (bnc#441944) Modified: branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp?rev=56577&r1=56576&r2=56577&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp (original) +++ branches/SuSE-SLE-10-SP3-Branch/installation/src/include/add-on-workflow.ycp Thu Apr 2 14:20:08 2009 @@ -576,24 +576,6 @@ // there is only one product on the given url if (size (products) == 1) { - // bugzilla #227605 - // this product with this url has been already installed or selected for installation - map src_general_data = Pkg::SourceGeneralData (AddOnProduct::src_id); - string current_url = src_general_data["url"]:""; - if (current_url != "" && current_url != nil) { - y2milestone ("%1", already_used_urls); - if (already_used_urls[current_url]:"" == src_general_data["product_dir"]:"") { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, current_url, src_general_data["product_dir"]:""); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - return `finish; - } - } - y2milestone ("Only one product available - skipping dialog"); map prod = products[0]:$[]; if (! AddOnProduct::CheckProductDependencies ([prod["name"]:""])) @@ -723,21 +705,6 @@ string url = data["url"]:""; string product_dir = data["product_dir"]:""; - // bugzilla #227605 - // this product with this url has been already installed or selected for installation - if (url != "" && url != nil) { - if (already_used_urls[url]:"" == product_dir) { - // error pop-up - Popup::Message (_("The product on the media is already installed -or selected for installation.")); - y2milestone ("Deleting installation source %1 %2 (%3)", - AddOnProduct::src_id, url, product_dir); - Pkg::SourceDelete (AddOnProduct::src_id); - AddOnProduct::ClearRegistrationRequest (AddOnProduct::src_id); - return `finish; - } - } - foreach (string product, selected, { AddOnProduct::add_on_products = add (AddOnProduct::add_on_products, $[ "media" : AddOnProduct::src_id == -1 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org