Hello community, here is the log from the commit of package yast2-pkg-bindings for openSUSE:Factory checked in at 2014-09-10 17:01:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-pkg-bindings (Old) and /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-pkg-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-pkg-bindings/yast2-pkg-bindings.changes 2014-08-27 07:45:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-pkg-bindings.new/yast2-pkg-bindings.changes 2014-09-10 17:02:06.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Sep 9 11:08:56 UTC 2014 - lslezak@suse.cz + +- do not hide libzypp exceptions in Pkg::ResolvableProperties() + call, it makes debugging more difficult, return nil in that case + (bnc#895418) +- 3.1.18 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-3.1.17.tar.bz2 New: ---- yast2-pkg-bindings-3.1.18.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.nIlMAI/_old 2014-09-10 17:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.nIlMAI/_new 2014-09-10 17:02:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings-devel-doc -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-pkg-bindings-%{version}.tar.bz2 ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.nIlMAI/_old 2014-09-10 17:02:09.000000000 +0200 +++ /var/tmp/diff_new_pack.nIlMAI/_new 2014-09-10 17:02:09.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-pkg-bindings-3.1.17.tar.bz2 -> yast2-pkg-bindings-3.1.18.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings-devel-doc.spec new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings-devel-doc.spec --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings-devel-doc.spec 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings-devel-doc.spec 2014-09-09 14:46:22.000000000 +0200 @@ -16,7 +16,7 @@ # Name: yast2-pkg-bindings-devel-doc -Version: 3.1.17 +Version: 3.1.18 Release: 0 License: GPL-2.0 Group: Documentation/HTML diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.changes new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.changes --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.changes 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.changes 2014-09-09 14:46:22.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 9 11:08:56 UTC 2014 - lslezak@suse.cz + +- do not hide libzypp exceptions in Pkg::ResolvableProperties() + call, it makes debugging more difficult, return nil in that case + (bnc#895418) +- 3.1.18 + +------------------------------------------------------------------- Tue Aug 19 07:39:01 UTC 2014 - lslezak@suse.cz - explicitly include <ostream> to avoid possible compile failures diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.spec new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.spec --- old/yast2-pkg-bindings-3.1.17/package/yast2-pkg-bindings.spec 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/package/yast2-pkg-bindings.spec 2014-09-09 14:46:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-pkg-bindings -Version: 3.1.17 +Version: 3.1.18 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-pkg-bindings-3.1.17/src/Resolvable_Properties.cc new/yast2-pkg-bindings-3.1.18/src/Resolvable_Properties.cc --- old/yast2-pkg-bindings-3.1.17/src/Resolvable_Properties.cc 2014-08-19 09:51:11.000000000 +0200 +++ new/yast2-pkg-bindings-3.1.18/src/Resolvable_Properties.cc 2014-09-09 14:46:22.000000000 +0200 @@ -537,43 +537,39 @@ 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); - - // add raw dependencies - for_(it, deps.begin(), deps.end()) - { - YCPMap rawdep; - rawdep->add(YCPString(*kind_it), YCPString(it->asString())); - rawdeps->add(rawdep); - } - - zypp::sat::WhatProvides prv(deps); - - // resolve dependencies - for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) - { - if (d->kind().asString().empty() || d->name().empty()) - { - y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); - } - else - { - 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)); - - if (!ycpdeps.contains(ycpdep)) - { - ycpdeps->add (ycpdep); - } - } - } - } - catch (...) - {} + zypp::Dep depkind(*kind_it); + zypp::Capabilities deps = item.resolvable()->dep(depkind); + + // add raw dependencies + for_(it, deps.begin(), deps.end()) + { + YCPMap rawdep; + rawdep->add(YCPString(*kind_it), YCPString(it->asString())); + rawdeps->add(rawdep); + } + + zypp::sat::WhatProvides prv(deps); + + // resolve dependencies + for (zypp::sat::WhatProvides::const_iterator d = prv.begin(); d != prv.end(); ++d) + { + if (d->kind().asString().empty() || d->name().empty()) + { + y2debug("Empty kind or name: kind: %s, name: %s", d->kind().asString().c_str(), d->name().c_str()); + } + else + { + 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)); + + if (!ycpdeps.contains(ycpdep)) + { + ycpdeps->add (ycpdep); + } + } + } } if (ycpdeps.size() > 0) @@ -659,36 +655,49 @@ 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)); - } - } - } - } + try + { + 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)); + } + } + } + } + catch(const zypp::Exception &expt) + { + y2error("ResolvableProperties for \"%s\" failed: %s", + s->name().c_str(), expt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(expt)); + return YCPVoid(); + } + } } } - catch (...) + catch(const zypp::Exception &expt) { + y2error("ResolvableProperties failed: %s", expt.asString().c_str()); + _last_error.setLastError(ExceptionAsString(expt)); + return YCPVoid(); } return ret; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org