October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52394 - in /trunk/pkg-bindings: VERSION package/yast2-pkg-bindings.changes
by lslezak＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: lslezak Date: Tue Oct 21 15:56:22 2008 New Revision: 52394 URL: http://svn.opensuse.org/viewcvs/yast?rev=52394&view=rev Log: - 2.17.21 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=52394&r… ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Tue Oct 21 15:56:22 2008 @@ -1 +1 @@ -2.17.20 +2.17.21 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-b… ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Tue Oct 21 15:56:22 2008 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Oct 21 11:08:21 CEST 2008 - lslezak(a)suse.cz + +- fixed ResolvableProperties() - correctly iterate over all + available/installed objects (bnc#436842) +- added Pkg::CreateSolverTestcase() debugging function to create + a solver testcase from YCP code +- 2.17.21 + +------------------------------------------------------------------- Fri Oct 17 12:06:44 CEST 2008 - lslezak(a)suse.cz - ServiceGet()/ServiceSet() - query/set ReposToEnable and -- 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] r52393 - /trunk/pkg-bindings/src/Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: lslezak Date: Tue Oct 21 15:55:49 2008 New Revision: 52393 URL: http://svn.opensuse.org/viewcvs/yast?rev=52393&view=rev Log: - fixed indenting Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Tue Oct 21 15:55:49 2008 @@ -176,272 +176,272 @@ YCPMap PkgFunctions::Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies) { - YCPMap info; + YCPMap info; - info->add(YCPString("name"), YCPString(item->name())); - info->add(YCPString("version"), YCPString(item->edition().asString())); - info->add(YCPString("arch"), YCPString(item->arch().asString())); - info->add(YCPString("description"), YCPString(item->description())); + info->add(YCPString("name"), YCPString(item->name())); + info->add(YCPString("version"), YCPString(item->edition().asString())); + info->add(YCPString("arch"), YCPString(item->arch().asString())); + info->add(YCPString("description"), YCPString(item->description())); - std::string resolvable_summary = item->summary(); - if (resolvable_summary.size() > 0) - { - info->add(YCPString("summary"), YCPString(resolvable_summary)); - } + std::string resolvable_summary = item->summary(); + if (resolvable_summary.size() > 0) + { + info->add(YCPString("summary"), YCPString(resolvable_summary)); + } - // status - std::string stat; + // status + std::string stat; - zypp::ResStatus status = item.status(); + zypp::ResStatus status = item.status(); - if (status.isInstalled() || status.isSatisfied()) - { - if (status.isToBeUninstalled()) - { - stat = "removed"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); - } - else - { - stat = "installed"; - } - } - else if (status.isToBeInstalled()) - { - stat = "selected"; - info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); - } - else - { - stat = "available"; - } + if (status.isInstalled() || status.isSatisfied()) + { + if (status.isToBeUninstalled()) + { + stat = "removed"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else + { + stat = "installed"; + } + } + else if (status.isToBeInstalled()) + { + stat = "selected"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else + { + stat = "available"; + } - info->add(YCPString("status"), YCPSymbol(stat)); + info->add(YCPString("status"), YCPSymbol(stat)); - // is the resolvable locked? (Locked or Taboo in the UI) - info->add(YCPString("locked"), YCPBoolean(status.isLocked())); + // is the resolvable locked? (Locked or Taboo in the UI) + info->add(YCPString("locked"), YCPBoolean(status.isLocked())); - // source - info->add(YCPString("source"), YCPInteger(logFindAlias(item->repoInfo().alias()))); + // source + info->add(YCPString("source"), YCPInteger(logFindAlias(item->repoInfo().alias()))); - // add license info if it is defined - std::string license = item->licenseToConfirm(); - if (!license.empty()) - { - info->add(YCPString("license_confirmed"), YCPBoolean(item.status().isLicenceConfirmed())); - info->add(YCPString("license"), YCPString(license)); - } + // add license info if it is defined + std::string license = item->licenseToConfirm(); + if (!license.empty()) + { + info->add(YCPString("license_confirmed"), YCPBoolean(item.status().isLicenceConfirmed())); + info->add(YCPString("license"), YCPString(license)); + } - info->add(YCPString("download_size"), YCPInteger(item->downloadSize())); - info->add(YCPString("inst_size"), YCPInteger(item->installSize())); + info->add(YCPString("download_size"), YCPInteger(item->downloadSize())); + info->add(YCPString("inst_size"), YCPInteger(item->installSize())); - info->add(YCPString("medium_nr"), YCPInteger(item->mediaNr())); - info->add(YCPString("vendor"), YCPString(item->vendor())); + info->add(YCPString("medium_nr"), YCPInteger(item->mediaNr())); + info->add(YCPString("vendor"), YCPString(item->vendor())); - // package specific info - if( req_kind == "package" ) - { - zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(item.resolvable()); - if ( pkg ) - { - std::string tmp = pkg->location().filename().asString(); - if (!tmp.empty()) - { - info->add(YCPString("path"), YCPString(tmp)); - } - - tmp = pkg->location().filename().basename(); - if (!tmp.empty()) - { - info->add(YCPString("location"), YCPString(tmp)); - } - } else - { - y2error("package %s is not a package", item->name().c_str() ); - } - } - // product specific info - else if( req_kind == "product" ) { - zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(item.resolvable()); - if ( !product ) - { - y2error("product %s is not a product", item->name().c_str() ); - return YCPMap(); - } - - std::string category(product->isTargetDistribution() ? "base" : "addon"); - - info->add(YCPString("category"), YCPString(category)); - info->add(YCPString("type"), YCPString(category)); - info->add(YCPString("relnotes_url"), YCPString(product->releaseNotesUrls().first().asString())); + // package specific info + if( req_kind == "package" ) + { + zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(item.resolvable()); + if ( pkg ) + { + std::string tmp = pkg->location().filename().asString(); + if (!tmp.empty()) + { + info->add(YCPString("path"), YCPString(tmp)); + } - std::string product_summary = product->summary(); - if (product_summary.size() > 0) - { - info->add(YCPString("display_name"), YCPString(product_summary)); - } + tmp = pkg->location().filename().basename(); + if (!tmp.empty()) + { + info->add(YCPString("location"), YCPString(tmp)); + } + } else + { + y2error("package %s is not a package", item->name().c_str() ); + } + } + // product specific info + else if( req_kind == "product" ) { + zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(item.resolvable()); + if ( !product ) + { + y2error("product %s is not a product", item->name().c_str() ); + return YCPMap(); + } - std::string product_shortname = product->shortName(); - if (product_shortname.size() > 0) - { - info->add(YCPString("short_name"), YCPString(product_shortname)); - } - // use summary for the short name if it's defined - else if (product_summary.size() > 0) - { - info->add(YCPString("short_name"), YCPString(product_summary)); - } + std::string category(product->isTargetDistribution() ? "base" : "addon"); - YCPList updateUrls; - zypp::Product::UrlList pupdateUrls = product->updateUrls(); - for_( it, pupdateUrls.begin(), pupdateUrls.end() ) - { - updateUrls->add(YCPString(it->asString())); - } - info->add(YCPString("update_urls"), updateUrls); + info->add(YCPString("category"), YCPString(category)); + info->add(YCPString("type"), YCPString(category)); + info->add(YCPString("relnotes_url"), YCPString(product->releaseNotesUrls().first().asString())); - YCPList flags; - std::list<std::string> pflags = product->flags(); - for (std::list<std::string>::const_iterator flag_it = pflags.begin(); - flag_it != pflags.end(); ++flag_it) - { - flags->add(YCPString(*flag_it)); - } - info->add(YCPString("flags"), flags); + std::string product_summary = product->summary(); + if (product_summary.size() > 0) + { + info->add(YCPString("display_name"), YCPString(product_summary)); + } - YCPList extraUrls( asYCPList(product->extraUrls()) ); - if ( extraUrls.size() ) - { - info->add(YCPString("extra_urls"), extraUrls); - } - - YCPList optionalUrls( asYCPList(product->optionalUrls()) ); - if ( optionalUrls.size() ) - { - info->add(YCPString("optional_urls"), optionalUrls); - } - - YCPList registerUrls( asYCPList(product->registerUrls()) ); - if ( registerUrls.size() ) - { - info->add(YCPString("register_urls"), registerUrls); - } - - YCPList smoltUrls( asYCPList(product->smoltUrls()) ); - if ( smoltUrls.size() ) - { - info->add(YCPString("smolt_urls"), smoltUrls); - } - - // registration data - info->add(YCPString("register_target"), YCPString(product->registerTarget())); - info->add(YCPString("register_release"), YCPString(product->registerRelease())); + std::string product_shortname = product->shortName(); + if (product_shortname.size() > 0) + { + info->add(YCPString("short_name"), YCPString(product_shortname)); + } + // use summary for the short name if it's defined + else if (product_summary.size() > 0) + { + info->add(YCPString("short_name"), YCPString(product_summary)); + } - // Live CD, FTP Edition... - info->add(YCPString("flavor"), YCPString(product->flavor())); + YCPList updateUrls; + zypp::Product::UrlList pupdateUrls = product->updateUrls(); + for_( it, pupdateUrls.begin(), pupdateUrls.end() ) + { + updateUrls->add(YCPString(it->asString())); + } + info->add(YCPString("update_urls"), updateUrls); - // get the installed Products it would replace. - zypp::Product::ReplacedProducts replaced(product->replacedProducts()); + YCPList flags; + std::list<std::string> pflags = product->flags(); + for (std::list<std::string>::const_iterator flag_it = pflags.begin(); + flag_it != pflags.end(); ++flag_it) + { + flags->add(YCPString(*flag_it)); + } + info->add(YCPString("flags"), flags); - if (!replaced.empty()) - { - YCPList rep_prods; + YCPList extraUrls( asYCPList(product->extraUrls()) ); + if ( extraUrls.size() ) + { + info->add(YCPString("extra_urls"), extraUrls); + } - // add the products to the list - for_( it, replaced.begin(), replaced.end() ) - { - // The current replaced Product. - zypp::Product::constPtr replacedProduct(*it); + YCPList optionalUrls( asYCPList(product->optionalUrls()) ); + if ( optionalUrls.size() ) + { + info->add(YCPString("optional_urls"), optionalUrls); + } - if (!replacedProduct) continue; + YCPList registerUrls( asYCPList(product->registerUrls()) ); + if ( registerUrls.size() ) + { + info->add(YCPString("register_urls"), registerUrls); + } - YCPMap rprod; - rprod->add(YCPString("name"), YCPString(replacedProduct->name())); - rprod->add(YCPString("version"), YCPString(replacedProduct->edition().asString())); - rprod->add(YCPString("arch"), YCPString(replacedProduct->arch().asString())); - rprod->add(YCPString("description"), YCPString(replacedProduct->description())); - - std::string product_summary = replacedProduct->summary(); - if (product_summary.size() > 0) - { - rprod->add(YCPString("display_name"), YCPString(product_summary)); - } - - std::string product_shortname = replacedProduct->shortName(); - if (product_shortname.size() > 0) - { - rprod->add(YCPString("short_name"), YCPString(product_shortname)); - } - // use summary for the short name if it's defined - else if (product_summary.size() > 0) - { - rprod->add(YCPString("short_name"), YCPString(product_summary)); - } - } + YCPList smoltUrls( asYCPList(product->smoltUrls()) ); + if ( smoltUrls.size() ) + { + info->add(YCPString("smolt_urls"), smoltUrls); + } - info->add(YCPString("replaces"), rep_prods); - } + // registration data + info->add(YCPString("register_target"), YCPString(product->registerTarget())); + info->add(YCPString("register_release"), YCPString(product->registerRelease())); + + // Live CD, FTP Edition... + info->add(YCPString("flavor"), YCPString(product->flavor())); + + // get the installed Products it would replace. + zypp::Product::ReplacedProducts replaced(product->replacedProducts()); + + if (!replaced.empty()) + { + YCPList rep_prods; + + // add the products to the list + for_( it, replaced.begin(), replaced.end() ) + { + // The current replaced Product. + zypp::Product::constPtr replacedProduct(*it); + + if (!replacedProduct) continue; + + YCPMap rprod; + rprod->add(YCPString("name"), YCPString(replacedProduct->name())); + rprod->add(YCPString("version"), YCPString(replacedProduct->edition().asString())); + rprod->add(YCPString("arch"), YCPString(replacedProduct->arch().asString())); + rprod->add(YCPString("description"), YCPString(replacedProduct->description())); + + std::string product_summary = replacedProduct->summary(); + if (product_summary.size() > 0) + { + rprod->add(YCPString("display_name"), YCPString(product_summary)); } - // pattern specific info - else if ( req_kind == "pattern" ) { - zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>(item.resolvable()); - info->add(YCPString("category"), YCPString(pattern->category())); - info->add(YCPString("user_visible"), YCPBoolean(pattern->userVisible())); - info->add(YCPString("default"), YCPBoolean(pattern->isDefault())); - info->add(YCPString("icon"), YCPString(pattern->icon().asString())); - info->add(YCPString("script"), YCPString(pattern->script().asString())); - info->add(YCPString("order"), YCPString(pattern->order())); + + std::string product_shortname = replacedProduct->shortName(); + if (product_shortname.size() > 0) + { + rprod->add(YCPString("short_name"), YCPString(product_shortname)); } - // patch specific info - else if ( req_kind == "patch" ) + // use summary for the short name if it's defined + else if (product_summary.size() > 0) { - zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(item.resolvable()); - - info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive())); - info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->rebootSuggested())); - info->add(YCPString("relogin_needed"), YCPBoolean(patch_ptr->reloginSuggested())); - info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->restartSuggested())); - info->add(YCPString("is_needed"), YCPBoolean(item.isBroken())); + rprod->add(YCPString("short_name"), YCPString(product_summary)); } + } + + info->add(YCPString("replaces"), rep_prods); + } + } + // pattern specific info + else if ( req_kind == "pattern" ) { + zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>(item.resolvable()); + info->add(YCPString("category"), YCPString(pattern->category())); + info->add(YCPString("user_visible"), YCPBoolean(pattern->userVisible())); + info->add(YCPString("default"), YCPBoolean(pattern->isDefault())); + info->add(YCPString("icon"), YCPString(pattern->icon().asString())); + info->add(YCPString("script"), YCPString(pattern->script().asString())); + info->add(YCPString("order"), YCPString(pattern->order())); + } + // patch specific info + else if ( req_kind == "patch" ) + { + zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(item.resolvable()); + + info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive())); + info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->rebootSuggested())); + info->add(YCPString("relogin_needed"), YCPBoolean(patch_ptr->reloginSuggested())); + info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->restartSuggested())); + info->add(YCPString("is_needed"), YCPBoolean(item.isBroken())); + } + + // dependency info + if (dependencies) + { + std::set<std::string> _kinds; + _kinds.insert("provides"); + _kinds.insert("prerequires"); + _kinds.insert("requires"); + _kinds.insert("conflicts"); + _kinds.insert("obsoletes"); + _kinds.insert("recommends"); + _kinds.insert("suggests"); + _kinds.insert("enhances"); + _kinds.insert("supplements"); + YCPList ycpdeps; + for (std::set<std::string>::const_iterator kind_it = _kinds.begin(); + kind_it != _kinds.end(); ++kind_it) + { + try { + zypp::Dep depkind(*kind_it); + zypp::Capabilities deps = item.resolvable()->dep(depkind); + + zypp::sat::WhatProvides prv(deps); - // dependency info - if (dependencies) + for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) { - std::set<std::string> _kinds; - _kinds.insert("provides"); - _kinds.insert("prerequires"); - _kinds.insert("requires"); - _kinds.insert("conflicts"); - _kinds.insert("obsoletes"); - _kinds.insert("recommends"); - _kinds.insert("suggests"); - _kinds.insert("enhances"); - _kinds.insert("supplements"); - YCPList ycpdeps; - for (std::set<std::string>::const_iterator kind_it = _kinds.begin(); - kind_it != _kinds.end(); ++kind_it) - { - try { - zypp::Dep depkind(*kind_it); - zypp::Capabilities deps = item.resolvable()->dep(depkind); - - zypp::sat::WhatProvides prv(deps); - - for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) - { - YCPMap ycpdep; - ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); - ycpdep->add (YCPString ("name"), YCPString (d->name())); - ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); - ycpdeps->add (ycpdep); - } - } - catch (...) - {} - } - info->add (YCPString ("dependencies"), ycpdeps); + YCPMap ycpdep; + ycpdep->add (YCPString ("res_kind"), YCPString (d->kind().asString())); + ycpdep->add (YCPString ("name"), YCPString (d->name())); + ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it)); + ycpdeps->add (ycpdep); } + } + catch (...) + {} + } + info->add (YCPString ("dependencies"), ycpdeps); + } return info; } -- 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] r52392 - in /trunk/pkg-bindings/src: Package.cc PkgFunctions.h Resolvable_Properties.cc
by lslezak＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: lslezak Date: Tue Oct 21 15:55:02 2008 New Revision: 52392 URL: http://svn.opensuse.org/viewcvs/yast?rev=52392&view=rev Log: - fixed ResolvableProperties() - correctly iterate over all available/installed objects (bnc#436842) - added Pkg::CreateSolverTestcase() debugging function to create a solver testcase from YCP code Modified: trunk/pkg-bindings/src/Package.cc trunk/pkg-bindings/src/PkgFunctions.h trunk/pkg-bindings/src/Resolvable_Properties.cc Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=… ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Tue Oct 21 15:55:02 2008 @@ -2468,3 +2468,20 @@ return true; } + +YCPValue PkgFunctions::CreateSolverTestCase(const YCPString &dir) +{ + if (dir.isNull()) + { + y2error("Pkg::CreateSolverTestcase(): nil parameter!"); + return YCPBoolean(false); + } + + std::string testcase_dir(dir->value()); + y2milestone("Creating a solver test case in directory %s", testcase_dir.c_str()); + bool success = zypp_ptr()->resolver()->createSolverTestcase(testcase_dir); + y2milestone("Testcase saved: %s", success ? "true" : "false"); + + return YCPBoolean(success); +} + Modified: trunk/pkg-bindings/src/PkgFunctions.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/PkgFunctions.h?… ============================================================================== --- trunk/pkg-bindings/src/PkgFunctions.h (original) +++ trunk/pkg-bindings/src/PkgFunctions.h Tue Oct 21 15:55:02 2008 @@ -185,6 +185,8 @@ bool CreateBaseProductSymlink(); + YCPMap Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies); + private: /** @@ -675,6 +677,8 @@ YCPValue PkgApplReset (); /* TYPEINFO: boolean(boolean)*/ YCPBoolean PkgSolve (const YCPBoolean& filter); + /* TYPEINFO: boolean(string)*/ + YCPValue CreateSolverTestCase(const YCPString &dir); /* TYPEINFO: boolean()*/ YCPBoolean PkgEstablish (); /* TYPEINFO: boolean()*/ Modified: trunk/pkg-bindings/src/Resolvable_Properties.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Resolvable_Prop… ============================================================================== --- trunk/pkg-bindings/src/Resolvable_Properties.cc (original) +++ trunk/pkg-bindings/src/Resolvable_Properties.cc Tue Oct 21 15:55:02 2008 @@ -174,79 +174,16 @@ return ret; } -YCPValue -PkgFunctions::ResolvablePropertiesEx(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version, bool dependencies) +YCPMap PkgFunctions::Resolvable2YCPMap(const zypp::PoolItem &item, const std::string &req_kind, bool dependencies) { - zypp::Resolvable::Kind kind; - std::string req_kind = kind_r->symbol (); - std::string nm = name->value(); - std::string vers = version->value(); - YCPList ret; - - if( req_kind == "product" ) { - kind = zypp::ResKind::product; - } - else if ( req_kind == "patch" ) { - kind = zypp::ResKind::patch; - } - else if ( req_kind == "package" ) { - kind = zypp::ResKind::package; - } - else if ( req_kind == "pattern" ) { - kind = zypp::ResKind::pattern; - } - else if ( req_kind == "language" ) - { - try - { - const zypp::LocaleSet &avlocales( zypp::ResPool::instance().getAvailableLocales() ); - - for_( it, avlocales.begin(), avlocales.end() ) - { - zypp::sat::LocaleSupport myLocale( *it ); - - YCPMap lang_map; - - lang_map->add(YCPString("name"), YCPString(myLocale.locale().name())); - lang_map->add(YCPString("code"), YCPString(myLocale.locale().code())); - lang_map->add(YCPString("packages"), YCPBoolean(myLocale.isAvailable())); - lang_map->add(YCPString("requested"), YCPBoolean(myLocale.isRequested())); - - ret->add(lang_map); - } - } - catch(const zypp::Exception &expt) - { - y2error("Caught exception: %s", expt.asString().c_str()); - _last_error.setLastError(ExceptionAsString(expt)); - return YCPVoid(); - } - - return ret; - } - else - { - y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); - return ret; - } - - try - { - for (zypp::ResPoolProxy::const_iterator it = zypp_ptr()->poolProxy().byKindBegin(kind); - it != zypp_ptr()->poolProxy().byKindEnd(kind); - ++it) - { - if ((nm.empty() || nm == (*it)->theObj()->name()) - && (vers.empty() || vers == (*it)->theObj()->edition().asString())) - { YCPMap info; - info->add(YCPString("name"), YCPString((*it)->theObj()->name())); - info->add(YCPString("version"), YCPString((*it)->theObj()->edition().asString())); - info->add(YCPString("arch"), YCPString((*it)->theObj()->arch().asString())); - info->add(YCPString("description"), YCPString((*it)->theObj()->description())); + info->add(YCPString("name"), YCPString(item->name())); + info->add(YCPString("version"), YCPString(item->edition().asString())); + info->add(YCPString("arch"), YCPString(item->arch().asString())); + info->add(YCPString("description"), YCPString(item->description())); - std::string resolvable_summary = (*it)->theObj()->summary(); + std::string resolvable_summary = item->summary(); if (resolvable_summary.size() > 0) { info->add(YCPString("summary"), YCPString(resolvable_summary)); @@ -255,60 +192,57 @@ // status std::string stat; - // selectable status - zypp::ui::Status status = (*it)->status(); + zypp::ResStatus status = item.status(); - switch((*it)->fate()) + if (status.isInstalled() || status.isSatisfied()) { - case zypp::ui::Selectable::TO_INSTALL: - stat = "selected"; - // add the transaction data - info->add(YCPString("transact_by"), YCPSymbol(TransactToString((*it)->theObj().status().getTransactByValue()))); - break; - case zypp::ui::Selectable::TO_DELETE: + if (status.isToBeUninstalled()) + { stat = "removed"; - // add the transaction data - info->add(YCPString("transact_by"), YCPSymbol(TransactToString((*it)->theObj().status().getTransactByValue()))); - break; - case zypp::ui::Selectable::UNMODIFIED: - stat = (status == zypp::ui::S_KeepInstalled - || status == zypp::ui::S_Protected) ? "installed" : "available"; - break; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else + { + stat = "installed"; + } + } + else if (status.isToBeInstalled()) + { + stat = "selected"; + info->add(YCPString("transact_by"), YCPSymbol(TransactToString(status.getTransactByValue()))); + } + else + { + stat = "available"; } info->add(YCPString("status"), YCPSymbol(stat)); - // the current (string) status in libzypp - // `S_Protected, `S_Taboo, `S_Del, `S_Update, `S_Install, `S_AutoDel, - // `S_AutoUpdate, `S_AutoInstall, `S_KeepInstalled, or `S_NoInst - info->add(YCPString("status_detail"), YCPSymbol(zypp::ui::asString(status))); - // is the resolvable locked? (Locked or Taboo in the UI) - info->add(YCPString("locked"), YCPBoolean(status == zypp::ui::S_Protected - || status == zypp::ui::S_Taboo)); + info->add(YCPString("locked"), YCPBoolean(status.isLocked())); // source - info->add(YCPString("source"), YCPInteger(logFindAlias((*it)->theObj()->repoInfo().alias()))); + info->add(YCPString("source"), YCPInteger(logFindAlias(item->repoInfo().alias()))); // add license info if it is defined - std::string license = (*it)->theObj()->licenseToConfirm(); + std::string license = item->licenseToConfirm(); if (!license.empty()) { - info->add(YCPString("license_confirmed"), YCPBoolean((*it)->theObj().status().isLicenceConfirmed())); + info->add(YCPString("license_confirmed"), YCPBoolean(item.status().isLicenceConfirmed())); info->add(YCPString("license"), YCPString(license)); } - info->add(YCPString("download_size"), YCPInteger((*it)->theObj()->downloadSize())); - info->add(YCPString("inst_size"), YCPInteger((*it)->theObj()->installSize())); + info->add(YCPString("download_size"), YCPInteger(item->downloadSize())); + info->add(YCPString("inst_size"), YCPInteger(item->installSize())); - info->add(YCPString("medium_nr"), YCPInteger((*it)->theObj()->mediaNr())); - info->add(YCPString("vendor"), YCPString((*it)->theObj()->vendor())); + info->add(YCPString("medium_nr"), YCPInteger(item->mediaNr())); + info->add(YCPString("vendor"), YCPString(item->vendor())); // package specific info if( req_kind == "package" ) { - zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>((*it)->theObj().resolvable()); + zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(item.resolvable()); if ( pkg ) { std::string tmp = pkg->location().filename().asString(); @@ -324,16 +258,16 @@ } } else { - y2error("package %s is not a package", (*it)->name().c_str() ); + y2error("package %s is not a package", item->name().c_str() ); } } // product specific info else if( req_kind == "product" ) { - zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>((*it)->theObj().resolvable()); + zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(item.resolvable()); if ( !product ) { - y2error("product %s is not a product", (*it)->name().c_str() ); - continue; + y2error("product %s is not a product", item->name().c_str() ); + return YCPMap(); } std::string category(product->isTargetDistribution() ? "base" : "addon"); @@ -451,7 +385,7 @@ } // pattern specific info else if ( req_kind == "pattern" ) { - zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>((*it)->theObj().resolvable()); + zypp::Pattern::constPtr pattern = boost::dynamic_pointer_cast<const zypp::Pattern>(item.resolvable()); info->add(YCPString("category"), YCPString(pattern->category())); info->add(YCPString("user_visible"), YCPBoolean(pattern->userVisible())); info->add(YCPString("default"), YCPBoolean(pattern->isDefault())); @@ -462,13 +396,13 @@ // patch specific info else if ( req_kind == "patch" ) { - zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>((*it)->theObj().resolvable()); + zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(item.resolvable()); info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive())); info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->rebootSuggested())); info->add(YCPString("relogin_needed"), YCPBoolean(patch_ptr->reloginSuggested())); info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->restartSuggested())); - info->add(YCPString("is_needed"), YCPBoolean((*it)->theObj().isBroken())); + info->add(YCPString("is_needed"), YCPBoolean(item.isBroken())); } // dependency info @@ -490,7 +424,7 @@ { try { zypp::Dep depkind(*kind_it); - zypp::Capabilities deps = (*it)->theObj().resolvable()->dep(depkind); + zypp::Capabilities deps = item.resolvable()->dep(depkind); zypp::sat::WhatProvides prv(deps); @@ -508,7 +442,101 @@ } info->add (YCPString ("dependencies"), ycpdeps); } - ret->add(info); + + return info; +} + +YCPValue +PkgFunctions::ResolvablePropertiesEx(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version, bool dependencies) +{ + zypp::Resolvable::Kind kind; + std::string req_kind = kind_r->symbol (); + std::string nm = name->value(); + std::string vers = version->value(); + YCPList ret; + + if( req_kind == "product" ) { + kind = zypp::ResKind::product; + } + else if ( req_kind == "patch" ) { + kind = zypp::ResKind::patch; + } + else if ( req_kind == "package" ) { + kind = zypp::ResKind::package; + } + else if ( req_kind == "pattern" ) { + kind = zypp::ResKind::pattern; + } + else if ( req_kind == "language" ) + { + try + { + const zypp::LocaleSet &avlocales( zypp::ResPool::instance().getAvailableLocales() ); + + for_( it, avlocales.begin(), avlocales.end() ) + { + zypp::sat::LocaleSupport myLocale( *it ); + + YCPMap lang_map; + + lang_map->add(YCPString("name"), YCPString(myLocale.locale().name())); + lang_map->add(YCPString("code"), YCPString(myLocale.locale().code())); + lang_map->add(YCPString("packages"), YCPBoolean(myLocale.isAvailable())); + lang_map->add(YCPString("requested"), YCPBoolean(myLocale.isRequested())); + + ret->add(lang_map); + } + } + catch(const zypp::Exception &expt) + { + y2error("Caught exception: %s", expt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(expt)); + return YCPVoid(); + } + + return ret; + } + else + { + y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); + return ret; + } + + try + { + for (zypp::ResPoolProxy::const_iterator it = zypp_ptr()->poolProxy().byKindBegin(kind); + it != zypp_ptr()->poolProxy().byKindEnd(kind); + ++it) + { + zypp::ui::Selectable::Ptr s = (*it); + + if (nm.empty() || nm == s->name()) + { + if (!s->installedEmpty()) + { + // iterate over all installed packages + for_(inst_it, s->installedBegin(), s->installedEnd()) + { + // check version if required + if (vers.empty() || vers == inst_it->resolvable()->edition().asString()) + { + ret->add(Resolvable2YCPMap(*inst_it, req_kind, dependencies)); + } + } + } + + if (!s->availableEmpty()) + { + // iterate over all available packages + for_(avail_it, s->availableBegin(), s->availableEnd()) + { + // check version if required + if (vers.empty() || vers == avail_it->resolvable()->edition().asString()) + { + ret->add(Resolvable2YCPMap(*avail_it, req_kind, dependencies)); + } + } + } } } } -- 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] r52391 - /trunk/gtk/src/YGPackageSelector.cc
by rpmcruz＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: rpmcruz Date: Tue Oct 21 15:37:53 2008 New Revision: 52391 URL: http://svn.opensuse.org/viewcvs/yast?rev=52391&view=rev Log: Let user edit unsupported software listing. Modified: trunk/gtk/src/YGPackageSelector.cc Modified: trunk/gtk/src/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/YGPackageSelector.cc?rev… ============================================================================== --- trunk/gtk/src/YGPackageSelector.cc (original) +++ trunk/gtk/src/YGPackageSelector.cc Tue Oct 21 15:37:53 2008 @@ -2538,38 +2538,9 @@ if (!strcmp (action, "accept")) { yuiMilestone() << "Closing PackageSelector with 'accept'" << endl; #if YAST2_VERSION >= 2017013 - if (pThis->confirmUnsupported()) { - Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); - query->addType (Ypp::Package::PACKAGE_TYPE); - query->setIsInstalled (false); - query->setToModify (true); - query->setIsUnsupported (true); - - Ypp::QueryPool *pool = new Ypp::QueryPool (query); - if (!pool->empty()) { - // show which packages are unsupported - GtkWidget *dialog; - dialog = gtk_message_dialog_new - (YGDialog::currentWindow(), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, - GTK_BUTTONS_NONE, "%s", _("Unsupported Packages")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", - _("Please realize that the following software is either unsupported or " - "requires an additional customer contract for support.")); - gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO, - GTK_STOCK_OK, GTK_RESPONSE_YES, NULL); - - PackagesView *view = new PackagesView (false, false); - view->setPool (pool); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), view->getWidget()); - - bool ok = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES; - gtk_widget_destroy (dialog); - if (!ok) return; - } - else - delete pool; - } + if (pThis->confirmUnsupported()) + if (!pThis->askConfirmUnsupported()) + return; #endif YGUI::ui()->sendEvent (new YMenuEvent ("accept")); } @@ -2604,6 +2575,42 @@ static bool confirm_cb (void *pThis) { return ((YGPackageSelector *)pThis)->confirmExit(); } + bool askConfirmUnsupported() + { + Ypp::QueryPool::Query *query = new Ypp::QueryPool::Query(); + query->addType (Ypp::Package::PACKAGE_TYPE); + query->setIsInstalled (false); + query->setToModify (true); + query->setIsUnsupported (true); + + Ypp::QueryPool *pool = new Ypp::QueryPool (query); + if (!pool->empty()) { + // show which packages are unsupported + GtkWidget *dialog; + dialog = gtk_message_dialog_new + (YGDialog::currentWindow(), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_WARNING, + GTK_BUTTONS_NONE, "%s", _("Unsupported Packages")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", + _("Please realize that the following software is either unsupported or " + "requires an additional customer contract for support.")); + gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_NO, + GTK_STOCK_OK, GTK_RESPONSE_YES, NULL); + + PackagesView *view = new PackagesView (false, true); + view->setPool (pool); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), view->getWidget()); + + bool ok = gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_YES; + gtk_widget_destroy (dialog); + return ok; + } + else { + delete pool; + return true; + } + } + virtual bool acceptLicense (Ypp::Package *package, const std::string &license) { GtkWidget *dialog = gtk_message_dialog_new (YGDialog::currentWindow(), -- 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] r52390 - /trunk/yast2/scripts/save_y2logs
by aschnell＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: aschnell Date: Tue Oct 21 15:09:11 2008 New Revision: 52390 URL: http://svn.opensuse.org/viewcvs/yast?rev=52390&view=rev Log: - also save install.inf Modified: trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=52… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Tue Oct 21 15:09:11 2008 @@ -53,6 +53,10 @@ LIST="$LIST $( cd /var/log/; ls zypp/history*)" fi +if [ -f /etc/install.inf ]; then + LIST="$LIST /etc/install.inf" +fi + RPM_LIST="rpm-qa" if [ -f /var/lib/rpm/Packages ]; then rpm -qa --qf '%{NAME}-%{VERSION}-%{RELEASE}\t\t\t(%{VENDOR})\t%{DISTRIBUTION}\n' 2>/dev/null | sort >/var/log/$RPM_LIST -- 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] r52389 - /trunk/yast2/scripts/save_y2logs
by sh-sh-sh＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: sh-sh-sh Date: Tue Oct 21 14:51:03 2008 New Revision: 52389 URL: http://svn.opensuse.org/viewcvs/yast?rev=52389&view=rev Log: removed useless clutter Modified: trunk/yast2/scripts/save_y2logs Modified: trunk/yast2/scripts/save_y2logs URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/scripts/save_y2logs?rev=52… ============================================================================== --- trunk/yast2/scripts/save_y2logs (original) +++ trunk/yast2/scripts/save_y2logs Tue Oct 21 14:51:03 2008 @@ -4,7 +4,6 @@ # to attach it to a Bugzilla bug report # # Author: Stefan Hundhammer <sh(a)suse.de> -# $Id$ usage() { -- 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] r52388 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-hd-lib.ycp
by aschnell＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: aschnell Date: Tue Oct 21 13:52:39 2008 New Revision: 52388 URL: http://svn.opensuse.org/viewcvs/yast?rev=52388&view=rev Log: - disallow editing of extended partitions Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-hd-lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Oct 21 13:52:39 2008 @@ -8,6 +8,7 @@ Mon Oct 20 12:36:48 CEST 2008 - aschnell(a)suse.de - avoid clearing file system label (bnc #436360) +- disallow editing of extended partitions - 2.17.41 ------------------------------------------------------------------- Modified: trunk/storage/storage/src/include/ep-hd-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-h… ============================================================================== --- trunk/storage/storage/src/include/ep-hd-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-lib.ycp Tue Oct 21 13:52:39 2008 @@ -221,6 +221,16 @@ return; } + if (data["type"]:`primary == `extended) + { + // error popup text + Popup::Error(_("An extended partition cannot be changed. +Delete this partition then create a new one using +the new parameters. +All data on this partition will be lost if you delete it.")); + return; + } + if (DlgEditPartition(data)) { Storage::ChangeVolumeProperties(data); -- 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] r52387 - in /trunk/qt: VERSION.cmake package/yast2-qt.changes src/YQGenericButton.cc
by tgoettlicher＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: tgoettlicher Date: Tue Oct 21 12:14:48 2008 New Revision: 52387 URL: http://svn.opensuse.org/viewcvs/yast?rev=52387&view=rev Log: Fixed default button (bnc #381187) Modified: trunk/qt/VERSION.cmake trunk/qt/package/yast2-qt.changes trunk/qt/src/YQGenericButton.cc Modified: trunk/qt/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/VERSION.cmake?rev=52387&r1=52… ============================================================================== --- trunk/qt/VERSION.cmake (original) +++ trunk/qt/VERSION.cmake Tue Oct 21 12:14:48 2008 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") SET(VERSION_MINOR "17") -SET(VERSION_PATCH "15") +SET(VERSION_PATCH "16") Modified: trunk/qt/package/yast2-qt.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/package/yast2-qt.changes?rev=… ============================================================================== --- trunk/qt/package/yast2-qt.changes (original) +++ trunk/qt/package/yast2-qt.changes Tue Oct 21 12:14:48 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Oct 21 11:51:17 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed default button (bnc #381187) +- V 2.17.16 + +------------------------------------------------------------------- Tue Oct 21 09:08:21 CEST 2008 - tgoettlicher(a)suse.de - Fixed bnc #436716: horizontal scrollbar for TreeWidget Modified: trunk/qt/src/YQGenericButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQGenericButton.cc?rev=52… ============================================================================== --- trunk/qt/src/YQGenericButton.cc (original) +++ trunk/qt/src/YQGenericButton.cc Tue Oct 21 12:14:48 2008 @@ -47,7 +47,6 @@ void YQGenericButton::setQPushButton( QPushButton * pb ) { _qPushButton = pb; - _qPushButton->setAutoDefault( true ); _qPushButton->installEventFilter( this ); _qPushButton->setAutoDefault( true ); @@ -158,6 +157,7 @@ { if ( _qPushButton ) { + _qPushButton->setAutoDefault( !show ); _qPushButton->setDefault( show ); _qPushButton->update(); } -- 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] r52386 - /tags/stable-2_17_30/bootloader/
by juhliarik＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: juhliarik Date: Tue Oct 21 12:09:07 2008 New Revision: 52386 URL: http://svn.opensuse.org/viewcvs/yast?rev=52386&view=rev Log: Created tag stable-2_17_30 for bootloader Added: tags/stable-2_17_30/bootloader/ - copied from r52385, 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] r52385 - in /trunk/bootloader: VERSION package/yast2-bootloader.changes src/modules/BootCommon.ycp src/modules/Bootloader.ycp src/routines/lilolike.ycp
by juhliarik＠svn.opensuse.org 21 Oct '08

21 Oct '08

Author: juhliarik Date: Tue Oct 21 12:08:52 2008 New Revision: 52385 URL: http://svn.opensuse.org/viewcvs/yast?rev=52385&view=rev Log: - added fix for wrong menu.lst in domU (bnc #436899) - added fix for problem with deleting all boot section in elilo (bnc #436890) Modified: trunk/bootloader/VERSION trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/Bootloader.ycp trunk/bootloader/src/routines/lilolike.ycp Modified: trunk/bootloader/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/VERSION?rev=52385&r1=… ============================================================================== --- trunk/bootloader/VERSION (original) +++ trunk/bootloader/VERSION Tue Oct 21 12:08:52 2008 @@ -1 +1 @@ -2.17.29 +2.17.30 Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloa… ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Tue Oct 21 12:08:52 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Oct 21 12:01:31 CEST 2008 - juhliarik(a)suse.cz + +- added fix for problem with deleting all boot section for elilo + (bnc #436899) +- added fox for problem with XEN boot section in domU (bnc #436899) +- 2.17.30 + +------------------------------------------------------------------- Fri Oct 17 14:58:02 CEST 2008 - juhliarik(a)suse.cz - added fix for adding language to GRUB (bnc #429287) Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommo… ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Tue Oct 21 12:08:52 2008 @@ -874,6 +874,10 @@ if ((globals["trusted_grub"]:"" == "true") && (haskey(globals, "gfxmenu"))) globals = remove(globals, "gfxmenu"); + // convert XEN section to linux section id running in domU + // bnc #436899 + ConvertXENinDomU (); + ret = ret && SetDeviceMap (my_device_mapping); ret = ret && SetSections (sections); ret = ret && SetGlobal (my_globals); Modified: trunk/bootloader/src/modules/Bootloader.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/Bootloade… ============================================================================== --- trunk/bootloader/src/modules/Bootloader.ycp (original) +++ trunk/bootloader/src/modules/Bootloader.ycp Tue Oct 21 12:08:52 2008 @@ -801,7 +801,16 @@ if ((section["root"]:nil == linux_default["root"]:nil) ||(section["root"]:nil == linux_failsafe["root"]:nil) ||(section["root"]:nil == linux_xen["root"]:nil)) - { + { + if (section["original_name"]:"" == "failsafe") + num_linux_failsafe = num_linux_failsafe -1; + + if (section["original_name"]:"" == "linux") + num_linux_default = num_linux_default -1; + + if (section["original_name"]:"" == "xen") + num_linux_xen = num_linux_xen -1; + y2milestone("deleted boot section: %1", section); return false; } else { @@ -813,6 +822,7 @@ }; return true; }); + ResolveSymlinksInSections(); y2milestone("Boot sections AFTER deleting: %1", BootCommon::sections); } Modified: trunk/bootloader/src/routines/lilolike.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/routines/lilolike… ============================================================================== --- trunk/bootloader/src/routines/lilolike.ycp (original) +++ trunk/bootloader/src/routines/lilolike.ycp Tue Oct 21 12:08:52 2008 @@ -1451,6 +1451,55 @@ return ret; } +/** + * Convert XEN boot section to normal linux section + * if intalling in domU (bnc #436899) + * + * @return boolean true if XEN section is converted to linux section + */ + +boolean ConvertXENinDomU () +{ + + boolean ret = false; + if (!Arch::is_xenU()) + { + y2milestone("Don't convert XEN section - it is not running in domU"); + return ret; + } + + // tmp sections + list<map<string,any> > tmp_sections = []; + + foreach(map<string,any> sec, BootCommon::sections, + { + if (sec["type"]:"" != "xen") + { + tmp_sections = add(tmp_sections, sec); + + } else { + // convert XEN section to linux section + y2milestone("Converting XEN section in domU: %1", sec); + sec["type"] = "image"; + sec["original_name"] = "linux"; + if (haskey(sec,"xen")) + sec = remove(sec, "xen"); + if (haskey(sec,"xen_append")) + sec = remove(sec, "xen_append"); + + y2milestone("Converted XEN section in domU: %1", sec); + + tmp_sections = add(tmp_sections, sec); + + ret = true; + } + }); + + BootCommon::sections = tmp_sections; + return ret; +} + + } // EOF -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0