Author: locilka Date: Fri Jan 23 16:45:04 2009 New Revision: 54954 URL: http://svn.opensuse.org/viewcvs/yast?rev=54954&view=rev Log: - Fixed displaying repository information for add-on products (bnc #459461) - Storing sources before calling registration on a running system (bnc #468449) - 2.18.0 Modified: trunk/add-on/VERSION trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/VERSION?rev=54954&r1=54953&r2=54954&view=diff ============================================================================== --- trunk/add-on/VERSION (original) +++ trunk/add-on/VERSION Fri Jan 23 16:45:04 2009 @@ -1 +1 @@ -2.17.12 +2.18.0 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=54954&r1=54953&r2=54954&view=diff ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Fri Jan 23 16:45:04 2009 @@ -1,7 +1,11 @@ ------------------------------------------------------------------- -Fri Jan 23 13:00:28 CET 2009 - locilka@suse.cz +Fri Jan 23 16:40:01 CET 2009 - locilka@suse.cz -- Added more logging when a wrong product is found. +- Fixed displaying repository information for add-on products + (bnc #459461) +- Storing sources before calling registration on a running system + (bnc #468449) +- 2.18.0 ------------------------------------------------------------------- Mon Jan 12 15:12:49 CET 2009 - locilka@suse.cz 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=54954&r1=54953&r2=54954&view=diff ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Fri Jan 23 16:45:04 2009 @@ -208,6 +208,14 @@ Pkg::SourceRefreshNow (AddOnProduct::src_id); Pkg::SourceLoad(); + // BNC #468449 + // It may happen that the add-on control file contains some code that + // would drop the changes made, so it's better to save the soruces now + if (Mode::normal()) { + y2milestone ("Saving all sources"); + Pkg::SourceSaveAll(); + } + AddOnProduct::last_ret = ret; y2milestone ("MediaSelect Dialog ret: %1", ret); return ret; @@ -1202,7 +1210,7 @@ void RedrawAddOnsOverviewTable () { list <map <string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); - integer medium_nr = nil; + integer source_nr = nil; map repository_info = nil; integer counter = -1; @@ -1210,21 +1218,29 @@ product_infos = $[]; foreach (map <string,any> one_product, all_products, { - if (one_product["type"]:"addon" != "addon") { + // only add-on products should be listed + if (haskey (one_product, "type") && one_product["type"]:"addon" != "addon") { y2milestone ("Skipping product: %1", one_product["display_name"]:one_product["name"]:""); - continue; + return; } - medium_nr = one_product["medium_nr"]:-1; - if (medium_nr != nil && medium_nr != -1) { + // BNC #459461 + // It's currently "source" key which defines the repository ID + source_nr = one_product["source"]:-1; + + if (source_nr == nil || source_nr == -1) { + y2warning ("Skipping product with no 'source' ID: %1", one_product); + } else { counter = counter + 1; - repository_info = Pkg::SourceGeneralData (one_product["source"]:-1); + repository_info = Pkg::SourceGeneralData (source_nr); if (repository_info == nil) { repository_info = $[]; } - //y2milestone ("Product: %1, Info: %2", one_product, repository_info); + // otherwise it fills the log too much + one_product["license"] = ""; + y2milestone ("Product: %1, Info: %2", one_product, repository_info); product_infos[tostring(counter)] = $[ "product" : one_product, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org