February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55545 - /branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: locilka Date: Tue Feb 17 13:36:03 2009 New Revision: 55545 URL: http://svn.opensuse.org/viewcvs/yast?rev=55545&view=rev Log: Fixed evaluation of return value Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Tue Feb 17 13:36:03 2009 @@ -1600,7 +1600,7 @@ } else if (userret == `delete) { y2milestone ("Removing selected product..."); - if (RemoveProductWithDependencies()) { + if (RemoveProductWithDependencies() == true) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55544 - in /branches/SuSE-Code-11-Branch/add-on: VERSION package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: locilka Date: Tue Feb 17 13:31:05 2009 New Revision: 55544 URL: http://svn.opensuse.org/viewcvs/yast?rev=55544&view=rev Log: - Installed products are not directly connected with their add-on repositories. Merging them together and removing both add-on product and repository when removing an add-on (bnc #475591). - 2.17.19 Modified: branches/SuSE-Code-11-Branch/add-on/VERSION branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Modified: branches/SuSE-Code-11-Branch/add-on/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/VE… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/VERSION (original) +++ branches/SuSE-Code-11-Branch/add-on/VERSION Tue Feb 17 13:31:05 2009 @@ -1 +1 @@ -2.17.18 +2.17.19 Modified: branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/pa… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes (original) +++ branches/SuSE-Code-11-Branch/add-on/package/yast2-add-on.changes Tue Feb 17 13:31:05 2009 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Feb 17 13:26:27 CET 2009 - locilka(a)suse.cz + +- Installed products are not directly connected with their add-on + repositories. Merging them together and removing both add-on + product and repository when removing an add-on (bnc #475591). +- 2.17.19 + +------------------------------------------------------------------- Wed Feb 11 19:10:33 CET 2009 - locilka(a)suse.cz - Selecting all products available on add-on media for installation Modified: branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/add-on/sr… ============================================================================== --- branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp (original) +++ branches/SuSE-Code-11-Branch/add-on/src/add-on-workflow.ycp Tue Feb 17 13:31:05 2009 @@ -1244,10 +1244,14 @@ ), sformat ( _("Repository URL: %1 "), - pi["repository","url"]:_("Unknown repository URL") + (size (pi["info","URLs"]:[]) > 0 ? + mergestring (pi["info","URLs"]:[], ",") + : + _("Unknown repository URL") + ) ), - (pi["repository","url"]:"" != pi["repository","alias"]:"" ? - sformat (_("Repository Alias: %1 "), pi["repository","alias"]:"") + (size (pi["info","aliases"]:[]) > 0 ? + sformat (_("Repository Alias: %1 "), mergestring (pi["info","aliases"]:[], ",")) : "" ) @@ -1266,9 +1270,73 @@ return return_this; } +/** + * Modifies repository info (adds some missing pieces). + */ +void AdjustRepositoryInfo (map <string, list> & info) { + foreach (integer one_repo, (list <integer>) info["IDs"]:[], { + if (one_repo == nil || one_repo == -1) { + y2warning ("Wrong repo ID: %1", one_repo); + return; + } + + map source_data = Pkg::SourceGeneralData (one_repo); + + if (source_data != nil && haskey (source_data, "base_urls")) { + info["URLs"] = source_data["base_urls"]:[]; + } else { + y2error ("No URLs for repo ID %1", one_repo); + } + + if (source_data != nil && haskey (source_data, "alias")) { + info["aliases"] = [source_data["alias"]:""]; + } + }); +} + +/** + * @struct $[ + * "IDs" : [8, 9, 12], + * "URLs" : ["dvd://", "http://some/URL/", "ftp://another/URL/"], + * "aliases" : ["alias1", "alias2", "alias3"], + * ] + */ +map <string, list> GetRepoInfo (map <string,any> & this_product, list <map <string,any> > & all_products) { + map <string, list> ret = $["IDs" : [], "URLs" : [], "aliases" : []]; + + string product_arch = this_product["arch"]:""; + string product_name = this_product["name"]:""; + string product_version = this_product["version"]:""; + + foreach (map <string,any> one_product, all_products, { + // if (one_product["status"]:`unknown != `available) return; + if (one_product["arch"]:"" != product_arch) return; + if (one_product["name"]:"" != product_name) return; + if (one_product["version"]:"" != product_version) return; + + if (haskey (one_product, "source") && one_product["source"]:-1 != -1) + ret["IDs"] = add (ret["IDs"]:[], one_product["source"]:-1); + }); + + AdjustRepositoryInfo (ret); + + return ret; +} + void RedrawAddOnsOverviewTable () { list <map <string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + all_products = maplist (map <string,any> one_product, all_products, { + // otherwise it fills the log too much + foreach (string key, ["license", "description"], { + if (haskey (one_product, key)) { + one_product[key] = substring (one_product[key]:"", 0, 40) + "..."; + } + }); + + return one_product; + }); + integer source_nr = nil; map repository_info = nil; integer counter = -1; @@ -1276,54 +1344,44 @@ list <term> products = []; product_infos = $[]; - foreach (map <string,any> one_product, all_products, { + list <map <string,any> > installed_products = filter (map <string,any> one_product, all_products, { + // Do not list the base product + if (one_product["category"]:"addon" == "base") + return false; + // BNC #475591: Only those `installed or `selected ones should be actually visible + return (one_product["status"]:`unknown == `installed || one_product["status"]:`unknown == `selected); + }); + + foreach (map <string,any> one_product, installed_products, { // 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"]:""); return; } - // 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 (source_nr); - if (repository_info == nil) { - repository_info = $[]; - } + counter = counter + 1; - // 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, - "repository" : repository_info, - ]; + y2milestone ("Product: %1, Info: %2", one_product, repository_info); - if (! haskey (repository_info, "base_urls")) { - repository_info["base_urls"] = []; - } + repository_info = GetRepoInfo (one_product, all_products); - products = add (products, `item ( - `id (sformat ("product_%1", counter)), - one_product["display_name"]:one_product["name"]:_("Unknown product"), - repository_info["url"]:repository_info["base_urls",0]:LogWrongProduct ( - one_product, "Unknown URL", _("Unknown URL") - ) - )); - } + product_infos[tostring(counter)] = $[ + "product" : one_product, + "info" : repository_info, + ]; + + products = add (products, `item ( + `id (sformat ("product_%1", counter)), + one_product["display_name"]:one_product["name"]:_("Unknown product"), + repository_info["URLs", 0]:_("Unknown URL") + )); }); UI::ChangeWidget (`id ("list_of_addons"), `Items, products); AdjustInfoWidget(); - UI::ChangeWidget (`id(`delete), `Enabled, (size (all_products) > 0)); + // Nothing to do delete when there are no product listed + UI::ChangeWidget (`id(`delete), `Enabled, (size (installed_products) > 0)); } boolean RunPackageSelector () { @@ -1332,15 +1390,17 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - if (result == `accept) { - Wizard::OpenNextBackDialog(); + if (result != `accept) { + return false; + } - y2milestone ("Calling inst_rpmcopy"); - WFM::call ("inst_rpmcopy"); - y2milestone ("Done"); + Wizard::OpenNextBackDialog(); - Wizard::CloseDialog(); - } + y2milestone ("Calling inst_rpmcopy"); + WFM::call ("inst_rpmcopy"); + y2milestone ("Done"); + + Wizard::CloseDialog(); return true; } @@ -1354,7 +1414,7 @@ map pi = ReturnCurrentlySelectedProductInfo(); if (pi == nil || pi == $[]) { y2error ("Cannot remove unknown product"); - return false; + return nil; } string product_name = pi["product","display_name"]:pi["product","name"]:_("Unknown product"); @@ -1370,14 +1430,14 @@ `focus_no )) { y2milestone ("Deleting '%1' canceled", product_name); - return false; + return nil; } // TRANSLATORS: busy popup message UI::OpenDialog (`Label(_("Removing product dependencies..."))); // OpenDialog-BusyMessage - integer src_id = pi["product","source"]:-1; + list <integer> src_ids = pi["info","IDs"]:[]; // Temporary definitions boolean pack_ret = false; @@ -1395,8 +1455,8 @@ list <map <string,any> > packages_from_repo = Pkg::ResolvableProperties ("", `package, ""); packages_from_repo = filter (map <string, any> one_package, packages_from_repo, { - // Package is not at the repository to be deleted - if (one_package["source"]:-1 != src_id) + // Package is not at the repositories to be deleted + if (! contains (src_ids, one_package["source"]:-1)) return false; // Package *is* at the repository to delete @@ -1411,6 +1471,7 @@ y2milestone ("%1 packages installed from repository", size (packages_from_repo)); // Removing selected product, whatever it means + // It might remove several products when they use the same name if ((pi["product","status"]:`unknown == `installed || pi["product","status"]:`unknown == `selected) && pi["product","name"]:"" != "") { y2milestone ("Removing product: '%1'", pi["product","name"]:""); Pkg::ResolvableRemove (pi["product","name"]:"", `product); @@ -1418,13 +1479,16 @@ y2milestone ("Product is neither `installed nor `selected"); } - // Removing repository of the selected product - if (src_id > -1) { - y2milestone ("Removing repository: %1, url: %2", src_id, pi["repository","url"]:""); - Pkg::SourceDelete (src_id); - } else { - y2milestone ("Product doesn't have any repository in use"); - } + // Removing repositories of the selected product + y2milestone ("Removing repositories: %1, url(s): %2", src_ids, pi["info","URLs"]:[]); + foreach (integer src_id, src_ids, { + if (src_id > -1) { + y2milestone ("Removing repository ID: %1", src_id); + Pkg::SourceDelete (src_id); + } else { + y2milestone ("Product doesn't have any repository in use"); + } + }); // The product repository is already removed, checking all installed packages @@ -1464,7 +1528,7 @@ UI::CloseDialog(); if (status_changed) { - RunPackageSelector(); + return RunPackageSelector(); } return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55543 - in /trunk/add-on: package/yast2-add-on.changes src/add-on-workflow.ycp
by locilka＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: locilka Date: Tue Feb 17 13:30:46 2009 New Revision: 55543 URL: http://svn.opensuse.org/viewcvs/yast?rev=55543&view=rev Log: - Installed products are not directly connected with their add-on repositories. Merging them together and removing both add-on product and repository when removing an add-on (bnc #475591). Modified: trunk/add-on/package/yast2-add-on.changes trunk/add-on/src/add-on-workflow.ycp Modified: trunk/add-on/package/yast2-add-on.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/package/yast2-add-on.chan… ============================================================================== --- trunk/add-on/package/yast2-add-on.changes (original) +++ trunk/add-on/package/yast2-add-on.changes Tue Feb 17 13:30:46 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 17 13:30:31 CET 2009 - locilka(a)suse.cz + +- Installed products are not directly connected with their add-on + repositories. Merging them together and removing both add-on + product and repository when removing an add-on (bnc #475591). + +------------------------------------------------------------------- Wed Feb 11 19:10:33 CET 2009 - locilka(a)suse.cz - Selecting all products available on add-on media for installation Modified: trunk/add-on/src/add-on-workflow.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/add-on/src/add-on-workflow.ycp?r… ============================================================================== --- trunk/add-on/src/add-on-workflow.ycp (original) +++ trunk/add-on/src/add-on-workflow.ycp Tue Feb 17 13:30:46 2009 @@ -1244,10 +1244,14 @@ ), sformat ( _("Repository URL: %1 "), - pi["repository","url"]:_("Unknown repository URL") + (size (pi["info","URLs"]:[]) > 0 ? + mergestring (pi["info","URLs"]:[], ",") + : + _("Unknown repository URL") + ) ), - (pi["repository","url"]:"" != pi["repository","alias"]:"" ? - sformat (_("Repository Alias: %1 "), pi["repository","alias"]:"") + (size (pi["info","aliases"]:[]) > 0 ? + sformat (_("Repository Alias: %1 "), mergestring (pi["info","aliases"]:[], ",")) : "" ) @@ -1266,9 +1270,73 @@ return return_this; } +/** + * Modifies repository info (adds some missing pieces). + */ +void AdjustRepositoryInfo (map <string, list> & info) { + foreach (integer one_repo, (list <integer>) info["IDs"]:[], { + if (one_repo == nil || one_repo == -1) { + y2warning ("Wrong repo ID: %1", one_repo); + return; + } + + map source_data = Pkg::SourceGeneralData (one_repo); + + if (source_data != nil && haskey (source_data, "base_urls")) { + info["URLs"] = source_data["base_urls"]:[]; + } else { + y2error ("No URLs for repo ID %1", one_repo); + } + + if (source_data != nil && haskey (source_data, "alias")) { + info["aliases"] = [source_data["alias"]:""]; + } + }); +} + +/** + * @struct $[ + * "IDs" : [8, 9, 12], + * "URLs" : ["dvd://", "http://some/URL/", "ftp://another/URL/"], + * "aliases" : ["alias1", "alias2", "alias3"], + * ] + */ +map <string, list> GetRepoInfo (map <string,any> & this_product, list <map <string,any> > & all_products) { + map <string, list> ret = $["IDs" : [], "URLs" : [], "aliases" : []]; + + string product_arch = this_product["arch"]:""; + string product_name = this_product["name"]:""; + string product_version = this_product["version"]:""; + + foreach (map <string,any> one_product, all_products, { + // if (one_product["status"]:`unknown != `available) return; + if (one_product["arch"]:"" != product_arch) return; + if (one_product["name"]:"" != product_name) return; + if (one_product["version"]:"" != product_version) return; + + if (haskey (one_product, "source") && one_product["source"]:-1 != -1) + ret["IDs"] = add (ret["IDs"]:[], one_product["source"]:-1); + }); + + AdjustRepositoryInfo (ret); + + return ret; +} + void RedrawAddOnsOverviewTable () { list <map <string,any> > all_products = Pkg::ResolvableProperties ("", `product, ""); + all_products = maplist (map <string,any> one_product, all_products, { + // otherwise it fills the log too much + foreach (string key, ["license", "description"], { + if (haskey (one_product, key)) { + one_product[key] = substring (one_product[key]:"", 0, 40) + "..."; + } + }); + + return one_product; + }); + integer source_nr = nil; map repository_info = nil; integer counter = -1; @@ -1276,54 +1344,44 @@ list <term> products = []; product_infos = $[]; - foreach (map <string,any> one_product, all_products, { + list <map <string,any> > installed_products = filter (map <string,any> one_product, all_products, { + // Do not list the base product + if (one_product["category"]:"addon" == "base") + return false; + // BNC #475591: Only those `installed or `selected ones should be actually visible + return (one_product["status"]:`unknown == `installed || one_product["status"]:`unknown == `selected); + }); + + foreach (map <string,any> one_product, installed_products, { // 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"]:""); return; } - // 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 (source_nr); - if (repository_info == nil) { - repository_info = $[]; - } + counter = counter + 1; - // 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, - "repository" : repository_info, - ]; + y2milestone ("Product: %1, Info: %2", one_product, repository_info); - if (! haskey (repository_info, "base_urls")) { - repository_info["base_urls"] = []; - } + repository_info = GetRepoInfo (one_product, all_products); - products = add (products, `item ( - `id (sformat ("product_%1", counter)), - one_product["display_name"]:one_product["name"]:_("Unknown product"), - repository_info["url"]:repository_info["base_urls",0]:LogWrongProduct ( - one_product, "Unknown URL", _("Unknown URL") - ) - )); - } + product_infos[tostring(counter)] = $[ + "product" : one_product, + "info" : repository_info, + ]; + + products = add (products, `item ( + `id (sformat ("product_%1", counter)), + one_product["display_name"]:one_product["name"]:_("Unknown product"), + repository_info["URLs", 0]:_("Unknown URL") + )); }); UI::ChangeWidget (`id ("list_of_addons"), `Items, products); AdjustInfoWidget(); - UI::ChangeWidget (`id(`delete), `Enabled, (size (all_products) > 0)); + // Nothing to do delete when there are no product listed + UI::ChangeWidget (`id(`delete), `Enabled, (size (installed_products) > 0)); } boolean RunPackageSelector () { @@ -1332,15 +1390,17 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); - if (result == `accept) { - Wizard::OpenNextBackDialog(); + if (result != `accept) { + return false; + } - y2milestone ("Calling inst_rpmcopy"); - WFM::call ("inst_rpmcopy"); - y2milestone ("Done"); + Wizard::OpenNextBackDialog(); - Wizard::CloseDialog(); - } + y2milestone ("Calling inst_rpmcopy"); + WFM::call ("inst_rpmcopy"); + y2milestone ("Done"); + + Wizard::CloseDialog(); return true; } @@ -1354,7 +1414,7 @@ map pi = ReturnCurrentlySelectedProductInfo(); if (pi == nil || pi == $[]) { y2error ("Cannot remove unknown product"); - return false; + return nil; } string product_name = pi["product","display_name"]:pi["product","name"]:_("Unknown product"); @@ -1370,14 +1430,14 @@ `focus_no )) { y2milestone ("Deleting '%1' canceled", product_name); - return false; + return nil; } // TRANSLATORS: busy popup message UI::OpenDialog (`Label(_("Removing product dependencies..."))); // OpenDialog-BusyMessage - integer src_id = pi["product","source"]:-1; + list <integer> src_ids = pi["info","IDs"]:[]; // Temporary definitions boolean pack_ret = false; @@ -1395,8 +1455,8 @@ list <map <string,any> > packages_from_repo = Pkg::ResolvableProperties ("", `package, ""); packages_from_repo = filter (map <string, any> one_package, packages_from_repo, { - // Package is not at the repository to be deleted - if (one_package["source"]:-1 != src_id) + // Package is not at the repositories to be deleted + if (! contains (src_ids, one_package["source"]:-1)) return false; // Package *is* at the repository to delete @@ -1411,6 +1471,7 @@ y2milestone ("%1 packages installed from repository", size (packages_from_repo)); // Removing selected product, whatever it means + // It might remove several products when they use the same name if ((pi["product","status"]:`unknown == `installed || pi["product","status"]:`unknown == `selected) && pi["product","name"]:"" != "") { y2milestone ("Removing product: '%1'", pi["product","name"]:""); Pkg::ResolvableRemove (pi["product","name"]:"", `product); @@ -1418,13 +1479,16 @@ y2milestone ("Product is neither `installed nor `selected"); } - // Removing repository of the selected product - if (src_id > -1) { - y2milestone ("Removing repository: %1, url: %2", src_id, pi["repository","url"]:""); - Pkg::SourceDelete (src_id); - } else { - y2milestone ("Product doesn't have any repository in use"); - } + // Removing repositories of the selected product + y2milestone ("Removing repositories: %1, url(s): %2", src_ids, pi["info","URLs"]:[]); + foreach (integer src_id, src_ids, { + if (src_id > -1) { + y2milestone ("Removing repository ID: %1", src_id); + Pkg::SourceDelete (src_id); + } else { + y2milestone ("Product doesn't have any repository in use"); + } + }); // The product repository is already removed, checking all installed packages @@ -1464,7 +1528,7 @@ UI::CloseDialog(); if (status_changed) { - RunPackageSelector(); + return RunPackageSelector(); } return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55542 - in /trunk/storage/storage/src: include/custom_part_dialogs.ycp include/do_proposal_flexible.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: aschnell Date: Tue Feb 17 12:59:02 2009 New Revision: 55542 URL: http://svn.opensuse.org/viewcvs/yast?rev=55542&view=rev Log: - removed some evms code Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp trunk/storage/storage/src/include/do_proposal_flexible.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Tue Feb 17 12:59:02 2009 @@ -987,7 +987,6 @@ if( new_val["type"]:`primary != `lvm && new_val["type"]:`primary != `sw_raid && - new_val["type"]:`primary != `evms && new_val["type"]:`primary != `loop && !Partitions::no_fsid_menu ) { fsid = `VBox( Modified: trunk/storage/storage/src/include/do_proposal_flexible.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/do_p… ============================================================================== --- trunk/storage/storage/src/include/do_proposal_flexible.ycp (original) +++ trunk/storage/storage/src/include/do_proposal_flexible.ycp Tue Feb 17 12:59:02 2009 @@ -65,10 +65,9 @@ ret = true; } if( !ret && soft ) + { ret = entry["used_by_type"]:`UB_NONE != `UB_NONE; - if( !ret && (Storage::ProposalEvms()&&!Storage::BootEvms()) && - entry["label"]:""!="msdos" ) - ret = true; + } if( ret ) { y2milestone( "ignoring disk %1 soft:%2", dev, soft ); @@ -3047,45 +3046,6 @@ tg = Storage::DelPartitionData( tg, d, "used_by_type" ); }); } - if( haskey( tg, "/dev/evms/lvm/"+ky ) || haskey( tg, "/dev/evms/lvm2/"+ky )) - { - if( haskey( tg, "/dev/evms/lvm/"+ky ) && tg[key,"lvm2"]:false ) - { - key = "/dev/evms/lvm/"+ky; - tg[key,"delete"] = true; - tg[key,"partitions"] = - maplist( map p, tg[key,"partitions"]:[], - ``{ - p["delete"] = true; - return(p); - }); - y2milestone( "remove_vm removed:%1", tg[key]:$[] ); - list<string> dl = tg[key,"devices"]:[]; - foreach( string d, dl, - ``{ - tg = Storage::DelPartitionData( tg, d, "used_by" ); - tg = Storage::DelPartitionData( tg, d, "used_by_type" ); - }); - } - if( haskey( tg, "/dev/evms/lvm2/"+ky ) && !tg[key,"lvm2"]:false ) - { - key = "/dev/evms/lvm2/"+ky; - tg[key,"delete"] = true; - tg[key,"partitions"] = - maplist( map p, tg[key,"partitions"]:[], - ``{ - p["delete"] = true; - return(p); - }); - y2milestone( "remove_vm removed:%1", tg[key]:$[] ); - list<string> dl = tg[key,"devices"]:[]; - foreach( string d, dl, - ``{ - tg = Storage::DelPartitionData( tg, d, "used_by" ); - tg = Storage::DelPartitionData( tg, d, "used_by_type" ); - }); - } - } return( tg ); } @@ -3093,13 +3053,9 @@ { string ret = ""; string key = "/dev/" + ky; - string key2 = "/dev/evms/lvm2/" + ky; if( Storage::ProposalLvm() && target[key,"lvm2"]:false && target[key,"size_k"]:0 >= min_size ) ret = key; - else if( Storage::ProposalEvms() && haskey( target, key2 ) && - target[key2,"size_k"]:0 >= min_size ) - ret = key2; y2milestone( "find_vm key:%1 min_size:%2 ret:%3", ky, min_size, ret ); return( ret ); } @@ -3155,12 +3111,12 @@ return( vg ); } -map create_vm( boolean evms, string key, map disk ) +map create_vm( string key, map disk ) { - y2milestone( "create_vm evms %1 key %2 disk %3", evms, key, disk ); - map ret = $[ "type" : evms?`CT_EVMS:`CT_LVM, - "name" : evms?"lvm2/"+key:key, - "device" : "/dev/"+(evms?"evms/lvm2/":"")+key, + y2milestone("create_vm key:%1 disk:%2", key, disk); + map ret = $[ "type" : `CT_LVM, + "name" : key, + "device" : "/dev/" + key, "lvm2" : true, "create" : true, "partitions" : [], @@ -3645,10 +3601,9 @@ ret["target"] = remove_used_by( ret["target"]:$[], sol_disk ); if( size(vg_key)==0 ) { - vg_key = (Storage::ProposalEvms()?"/dev/evms/lvm2/":"/dev/")+key; + vg_key = "/dev/" + key; map vg = ret["target",vg_key]:$[]; - vg = union( vg, create_vm( Storage::ProposalEvms(), key, - solution[sol_disk]:$[] )); + vg = union( vg, create_vm( key, solution[sol_disk]:$[] )); if( size(vg["devices"]:[])>0 ) { vg = remove( vg, "devices" ); @@ -3675,9 +3630,8 @@ map get_proposal_vm( map<string,map> target, string key, map disk ) { string ddev = disk["device"]:""; - y2milestone( "get_proposal_vm ddev:%1 vg:%2 evms:%3 lvm:%4 home:%5", ddev, - key, Storage::ProposalEvms(), Storage::ProposalLvm(), - Storage::ProposalHome() ); + y2milestone("get_proposal_vm ddev:%1 vg:%2 lvm:%3 home:%4", ddev, + key, Storage::ProposalLvm(), Storage::ProposalHome()); map ret = $[]; map opts = Storage::GetControlCfg(); target = remove_mount_points(target); @@ -3712,9 +3666,9 @@ else if( haskey( r, "targets" )) ret["target"] = r["targets"]:$[]; ret["target"] = remove_used_by( ret["target"]:$[], ddev ); - string vg_key = (Storage::ProposalEvms()?"/dev/evms/lvm2/":"/dev/")+key; + string vg_key = "/dev/" + key; map vg = ret["target",vg_key]:$[]; - vg = union( vg, create_vm( Storage::ProposalEvms(), key, disk )); + vg = union( vg, create_vm( key, disk )); if( size(vg["devices"]:[])>0 ) { vg = remove( vg, "devices" ); @@ -3733,9 +3687,8 @@ { map ret = $[]; string vg = Storage::ProposalVM(); - y2milestone( "get_inst_prop vg:%1 evms:%2 lvm:%3 home:%4", vg, - Storage::ProposalEvms(), Storage::ProposalLvm(), - Storage::ProposalHome() ); + y2milestone("get_inst_prop vg:%1 lvm:%2 home:%3", vg, + Storage::ProposalLvm(), Storage::ProposalHome()); if( size(vg)==0 ) { if( has_flex_proposal() ) Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Tue Feb 17 12:59:02 2009 @@ -6259,11 +6259,6 @@ y2milestone("SetProposalLvm val:%1 lvm:%2", val, proposal_lvm); } -global boolean ProposalEvms() - { - return false; - } - global boolean ProposalLvm() { return( proposal_lvm ); @@ -6344,11 +6339,6 @@ } -global boolean BootEvms() - { - return false; - } - global string ProposalVM() { string ret = ""; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55541 - in /trunk: slide-show/MAINTAINER theme/MAINTAINER
by sh-sh-sh＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: sh-sh-sh Date: Tue Feb 17 12:24:03 2009 New Revision: 55541 URL: http://svn.opensuse.org/viewcvs/yast?rev=55541&view=rev Log: new maintainers Modified: trunk/slide-show/MAINTAINER trunk/theme/MAINTAINER Modified: trunk/slide-show/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/slide-show/MAINTAINER?rev=55541&… ============================================================================== --- trunk/slide-show/MAINTAINER (original) +++ trunk/slide-show/MAINTAINER Tue Feb 17 12:24:03 2009 @@ -1 +1 @@ -Stefan Hundhammer <sh(a)suse.de> +Karl Eichwalder <ke(a)suse.de> Modified: trunk/theme/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/theme/MAINTAINER?rev=55541&r1=55… ============================================================================== --- trunk/theme/MAINTAINER (original) +++ trunk/theme/MAINTAINER Tue Feb 17 12:24:03 2009 @@ -1 +1 @@ -Stefan Hundhammer <sh(a)suse.de> +Thomas Goettlicher <tgoettlicher(a)suse.de> -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55540 - in /trunk/qt-graph: VERSION.cmake package/yast2-qt-graph.changes
by aschnell＠svn.opensuse.org 17 Feb '09

17 Feb '09

Author: aschnell Date: Tue Feb 17 11:19:15 2009 New Revision: 55540 URL: http://svn.opensuse.org/viewcvs/yast?rev=55540&view=rev Log: - bump version for autobuild Modified: trunk/qt-graph/VERSION.cmake trunk/qt-graph/package/yast2-qt-graph.changes Modified: trunk/qt-graph/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/VERSION.cmake?rev=55540… ============================================================================== --- trunk/qt-graph/VERSION.cmake (original) +++ trunk/qt-graph/VERSION.cmake Tue Feb 17 11:19:15 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "18") -SET(VERSION_PATCH "2") +SET(VERSION_PATCH "3") Modified: trunk/qt-graph/package/yast2-qt-graph.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/package/yast2-qt-graph.… ============================================================================== --- trunk/qt-graph/package/yast2-qt-graph.changes (original) +++ trunk/qt-graph/package/yast2-qt-graph.changes Tue Feb 17 11:19:15 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Feb 17 10:37:58 CET 2009 - aschnell(a)suse.de + +- various minor fixes and improvements +- 2.18.3 + +------------------------------------------------------------------- Tue Jan 27 15:34:53 CET 2009 - aschnell(a)suse.de - added simple user-interaction -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55539 - in /trunk/qt-graph/src: QY2Graph.cc QY2Graph.h YQGraph.cc
by aschnell＠svn.opensuse.org 16 Feb '09

16 Feb '09

Author: aschnell Date: Mon Feb 16 18:01:40 2009 New Revision: 55539 URL: http://svn.opensuse.org/viewcvs/yast?rev=55539&view=rev Log: - Qt-ish ordering of constructor arguments Modified: trunk/qt-graph/src/QY2Graph.cc trunk/qt-graph/src/QY2Graph.h trunk/qt-graph/src/YQGraph.cc Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=555… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Mon Feb 16 18:01:40 2009 @@ -28,7 +28,7 @@ #include "QY2Graph.h" -QY2Graph::QY2Graph(QWidget* parent, const std::string& filename, const std::string& layoutAlgorithm) +QY2Graph::QY2Graph(const std::string& filename, const std::string& layoutAlgorithm, QWidget* parent) : QGraphicsView(parent) { init(); @@ -37,7 +37,7 @@ } -QY2Graph::QY2Graph(QWidget* parent, graph_t* graph) +QY2Graph::QY2Graph(graph_t* graph, QWidget* parent) : QGraphicsView(parent) { init(); Modified: trunk/qt-graph/src/QY2Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.h?rev=5553… ============================================================================== --- trunk/qt-graph/src/QY2Graph.h (original) +++ trunk/qt-graph/src/QY2Graph.h Mon Feb 16 18:01:40 2009 @@ -40,9 +40,9 @@ public: - QY2Graph(QWidget* parent, const std::string& filename, const std::string& layoutAlgorithm); + QY2Graph(const std::string& filename, const std::string& layoutAlgorithm, QWidget* parent = 0); - QY2Graph(QWidget* parent, graph_t* graph); + QY2Graph(graph_t* graph, QWidget* parent = 0); virtual ~QY2Graph(); Modified: trunk/qt-graph/src/YQGraph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/YQGraph.cc?rev=5553… ============================================================================== --- trunk/qt-graph/src/YQGraph.cc (original) +++ trunk/qt-graph/src/YQGraph.cc Mon Feb 16 18:01:40 2009 @@ -33,7 +33,7 @@ YQGraph::YQGraph(YWidget* parent, const string& filename, const string& layoutAlgorithm) - : QY2Graph((QWidget*) parent->widgetRep(), filename, layoutAlgorithm), + : QY2Graph(filename, layoutAlgorithm, (QWidget*) parent->widgetRep()), YGraph(parent, filename, layoutAlgorithm) { setWidgetRep(this); @@ -44,7 +44,7 @@ YQGraph::YQGraph(YWidget* parent, graph_t* graph) - : QY2Graph((QWidget*) parent->widgetRep(), graph), + : QY2Graph(graph, (QWidget*) parent->widgetRep()), YGraph(parent, graph) { setWidgetRep(this); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55538 - /branches/tmp/juhliarik/bootloader-UIrefactor/
by jreidinger＠svn.opensuse.org 16 Feb '09

16 Feb '09

Author: jreidinger Date: Mon Feb 16 16:09:02 2009 New Revision: 55538 URL: http://svn.opensuse.org/viewcvs/yast?rev=55538&view=rev Log: create branch for UI refactoring Added: branches/tmp/juhliarik/bootloader-UIrefactor/ - copied from r55537, trunk/bootloader/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55537 - /tags/stable-2_18_6/network/
by mzugec＠svn.opensuse.org 16 Feb '09

16 Feb '09

Author: mzugec Date: Mon Feb 16 16:04:48 2009 New Revision: 55537 URL: http://svn.opensuse.org/viewcvs/yast?rev=55537&view=rev Log: Created tag stable-2_18_6 for network Added: tags/stable-2_18_6/network/ - copied from r55536, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55536 - in /trunk/network: VERSION package/yast2-network.changes src/modules/Lan.ycp
by mzugec＠svn.opensuse.org 16 Feb '09

16 Feb '09

Author: mzugec Date: Mon Feb 16 16:04:12 2009 New Revision: 55536 URL: http://svn.opensuse.org/viewcvs/yast?rev=55536&view=rev Log: AutoYaST - show Imported settings in UI (bnc#461650) Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/modules/Lan.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=55536&r1=555… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Mon Feb 16 16:04:12 2009 @@ -1 +1 @@ -2.18.5 +2.18.6 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Feb 16 16:04:12 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 16 15:54:16 CET 2009 - mzugec(a)suse.cz + +- AutoYaST - show Imported settings in UI (bnc#461650) +- 2.18.6 + +------------------------------------------------------------------- Mon Feb 16 14:17:41 CET 2009 - mzugec(a)suse.cz - headers for yast lan list (bnc#443753) Modified: trunk/network/src/modules/Lan.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Lan.ycp?rev=… ============================================================================== --- trunk/network/src/modules/Lan.ycp (original) +++ trunk/network/src/modules/Lan.ycp Mon Feb 16 16:04:12 2009 @@ -581,17 +581,11 @@ */ global define boolean Import(map settings) { - if (!Mode::autoinst()) { - // FIXME: MOD Modules = (map) eval(settings["modules"]:$[]); - NetworkInterfaces::Import("netcard", (map<string, map>) settings["devices"]:$[]); - - } else { NetworkInterfaces::Import("netcard", (map<string, map>) settings["devices"]:$[]); foreach(string device, NetworkInterfaces::List(""), { LanItems::AddNew(); LanItems::Items[LanItems::current]=$["ifcfg":device]; }); - } LanItems::autoinstall_settings["start_immediately"] = settings["start_immediately"]:false; LanItems::autoinstall_settings["strict_IP_check_timeout"] = settings["strict_IP_check_timeout"]:-1; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0