Author: lslezak Date: Fri Aug 31 11:36:21 2007 New Revision: 40640 URL: http://svn.opensuse.org/viewcvs/yast?rev=40640&view=rev Log: - fixed inverted result of PkgAvailable() and PkgInstalled() - 2.15.48 Modified: trunk/pkg-bindings/VERSION trunk/pkg-bindings/package/yast2-pkg-bindings.changes trunk/pkg-bindings/src/Package.cc Modified: trunk/pkg-bindings/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/VERSION?rev=40640&r1=40639&r2=40640&view=diff ============================================================================== --- trunk/pkg-bindings/VERSION (original) +++ trunk/pkg-bindings/VERSION Fri Aug 31 11:36:21 2007 @@ -1 +1 @@ -2.15.47 +2.15.48 Modified: trunk/pkg-bindings/package/yast2-pkg-bindings.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/package/yast2-pkg-bindings.changes?rev=40640&r1=40639&r2=40640&view=diff ============================================================================== --- trunk/pkg-bindings/package/yast2-pkg-bindings.changes (original) +++ trunk/pkg-bindings/package/yast2-pkg-bindings.changes Fri Aug 31 11:36:21 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Aug 31 11:28:08 CEST 2007 - lslezak@suse.cz + +- fixed inverted result of PkgAvailable() and PkgInstalled() +- 2.15.48 + +------------------------------------------------------------------- Thu Aug 30 19:57:49 CEST 2007 - lslezak@suse.cz - don't log debug messages from zypp if debug logging is turned off Modified: trunk/pkg-bindings/src/Package.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/pkg-bindings/src/Package.cc?rev=40640&r1=40639&r2=40640&view=diff ============================================================================== --- trunk/pkg-bindings/src/Package.cc (original) +++ trunk/pkg-bindings/src/Package.cc Fri Aug 31 11:36:21 2007 @@ -530,9 +530,9 @@ PkgModuleFunctions::searchPackage(const YCPString &package, bool installed) { bool found = false; - std::string pkg = package->value(); + std::string pkgname = package->value(); - if (pkg.empty()) + if (pkgname.empty()) { y2warning("Pkg::%s: Package name is empty", installed ? "PkgInstalled" : "PkgAvailable"); return YCPBoolean(false); @@ -540,8 +540,8 @@ try { - for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkg); - it != zypp_ptr()->pool().byNameEnd(pkg); + for (zypp::ResPool::byName_iterator it = zypp_ptr()->pool().byNameBegin(pkgname); + it != zypp_ptr()->pool().byNameEnd(pkgname); ++it) { zypp::Package::constPtr pkg = zypp::asKindzypp::Package( it->resolvable() ); @@ -549,7 +549,8 @@ if (pkg != NULL) { long long sid = logFindAlias(pkg->repository().info().alias()); - if ((installed && sid >= 0LL) || (!installed && sid < 0LL)) + y2debug("Package '%s' repo: %lld", pkgname.c_str(), sid); + if ((installed && sid < 0LL) || (!installed && sid >= 0LL)) { found = true; break; @@ -561,7 +562,7 @@ { } - y2milestone("Package '%s' %s: %s", pkg.c_str(), installed ? "installed" : "available", found ? "true" : "false"); + y2milestone("Package '%s' %s: %s", pkgname.c_str(), installed ? "installed" : "available", found ? "true" : "false"); return YCPBoolean(found); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org