Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Wed Apr 16 18:30:16 CEST 2008.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-04-15 16:32:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2008-04-16 18:21:28.000000000 +0200
@@ -1,0 +2,12 @@
+Wed Apr 16 18:21:09 CEST 2008 - coolo@suse.de
+
+- catching errors - programming defensive (bnc#380283)
+- 2.16.28
+
+-------------------------------------------------------------------
+Wed Apr 16 15:07:02 CEST 2008 - lslezak@suse.cz
+
+- searchPackage - use isSystem() property instead of searching
+ in repositories (bnc#380141, comment 5)
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.16.27.tar.bz2
New:
----
yast2-pkg-bindings-2.16.28.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.y18941/_old 2008-04-16 18:29:56.000000000 +0200
+++ /var/tmp/diff_new_pack.y18941/_new 2008-04-16 18:29:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.27)
+# spec file for package yast2-pkg-bindings-devel-doc (Version 2.16.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-pkg-bindings-devel-doc
-Version: 2.16.27
+Version: 2.16.28
Release: 1
License: GPL v2 or later
Group: Documentation/HTML
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.16.27.tar.bz2
+Source0: yast2-pkg-bindings-2.16.28.tar.bz2
Prefix: %_prefix
# same as in the main package (because we use the same configure.in.in)
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt libzypp-devel perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
@@ -38,7 +38,7 @@
Ladislav Slez�k
%prep
-%setup -n yast2-pkg-bindings-2.16.27
+%setup -n yast2-pkg-bindings-2.16.28
# build only documentation, ignore all other directories
echo "doc" > SUBDIRS
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.y18941/_old 2008-04-16 18:29:56.000000000 +0200
+++ /var/tmp/diff_new_pack.y18941/_new 2008-04-16 18:29:56.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.16.27)
+# spec file for package yast2-pkg-bindings (Version 2.16.28)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,12 +12,12 @@
Name: yast2-pkg-bindings
-Version: 2.16.27
+Version: 2.16.28
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.16.27.tar.bz2
+Source0: yast2-pkg-bindings-2.16.28.tar.bz2
Prefix: /usr
BuildRequires: blocxx-devel docbook-xsl-stylesheets doxygen gcc-c++ libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer sgml-skel yast2-core-devel yast2-devtools
BuildRequires: libzypp-devel >= 4.4.0
@@ -40,7 +40,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.16.27
+%setup -n yast2-pkg-bindings-2.16.28
# build only the library, ignore documentation (it is in devel-doc package)
echo "src" > SUBDIRS
@@ -72,6 +72,12 @@
%{_libdir}/YaST2/plugin/libpy2Pkg.so
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog
+* Wed Apr 16 2008 coolo@suse.de
+- catching errors - programming defensive (bnc#380283)
+- 2.16.28
+* Wed Apr 16 2008 lslezak@suse.cz
+- searchPackage - use isSystem() property instead of searching
+ in repositories (bnc#380141, comment 5)
* Tue Apr 15 2008 lslezak@suse.cz
- added support for `languages in ResolvableProperties()
- set the default RPM log file name in Pkg::PkgCommit() if it
++++++ yast2-pkg-bindings-2.16.27.tar.bz2 -> yast2-pkg-bindings-2.16.28.tar.bz2 ++++++
++++ 1669 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.27/configure.in new/yast2-pkg-bindings-2.16.28/configure.in
--- old/yast2-pkg-bindings-2.16.27/configure.in 2008-04-15 16:31:20.000000000 +0200
+++ new/yast2-pkg-bindings-2.16.28/configure.in 2008-02-08 15:34:01.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-pkg-bindings
dnl
-dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.16.3 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.16.27, http://bugs.opensuse.org/, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.16.12, http://bugs.opensuse.org/, yast2-pkg-bindings)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.16.27"
+VERSION="2.16.12"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Ladislav Slezák "
@@ -108,7 +108,7 @@
dnl no need for AC_ARG_VAR
AC_PATH_PROG(XGETTEXT, xgettext)
if test -z "$XGETTEXT" ; then
- AC_MSG_ERROR(xgettext is missing; please install gettext-tools.)
+ AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi
Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.27/src/Package.cc new/yast2-pkg-bindings-2.16.28/src/Package.cc
--- old/yast2-pkg-bindings-2.16.27/src/Package.cc 2008-04-15 15:52:46.000000000 +0200
+++ new/yast2-pkg-bindings-2.16.28/src/Package.cc 2008-04-16 18:04:46.000000000 +0200
@@ -543,9 +543,7 @@
if (pkg != NULL)
{
- long long sid = logFindAlias(pkg->repoInfo().alias());
- y2debug("Package '%s' repo: %lld", pkgname.c_str(), sid);
- if ((installed && sid < 0LL) || (!installed && sid >= 0LL))
+ if (installed == pkg->isSystem())
{
found = true;
break;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.27/src/Resolvable_Properties.cc new/yast2-pkg-bindings-2.16.28/src/Resolvable_Properties.cc
--- old/yast2-pkg-bindings-2.16.27/src/Resolvable_Properties.cc 2008-04-15 15:24:18.000000000 +0200
+++ new/yast2-pkg-bindings-2.16.28/src/Resolvable_Properties.cc 2008-04-16 18:19:25.000000000 +0200
@@ -50,7 +50,7 @@
@short Return properties of resolvable
@description
return list of resolvables of selected kind with required name
-
+
@param name name of the resolvable, if empty returns all resolvables of the kind
@param kind_r kind of resolvable, can be `product, `patch, `package, `pattern or `language
@param version version of the resolvable, if empty all versions are returned
@@ -59,7 +59,7 @@
status is `installed, `removed, `selected or `available, source is source ID or -1 if the resolvable is installed in the target
if status is `available and locked is true then the object is set to taboo,
if status is `installed and locked is true then the object locked
- if status is `selected or `removed there is extra key "transact_by" : symbol, where symbol is `user (the highest level),
+ if status is `selected or `removed there is extra key "transact_by" : symbol, where symbol is `user (the highest level),
`app_high (selected by Yast), `app_low and `solver (the lowest level)
*/
@@ -94,7 +94,7 @@
case zypp::ResStatus::SOLVER : ret = "solver"; break;
}
- return ret;
+ return ret;
}
YCPValue
@@ -131,7 +131,7 @@
try
{
const zypp::LocaleSet &avlocales( zypp::ResPool::instance().getAvailableLocales() );
-
+
for_( it, avlocales.begin(), avlocales.end() )
{
zypp::sat::LocaleSupport myLocale( *it );
@@ -162,7 +162,7 @@
}
try
- {
+ {
for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(kind);
it != zypp_ptr()->pool().byKindEnd(kind);
++it)
@@ -230,27 +230,37 @@
info->add(YCPString("medium_nr"), YCPInteger((*it)->mediaNr()));
info->add(YCPString("vendor"), YCPString((*it)->vendor()));
-
+
// package specific info
if( req_kind == "package" )
{
zypp::Package::constPtr pkg = boost::dynamic_pointer_cast<const zypp::Package>(it->resolvable());
-
- std::string tmp = pkg->location().filename().asString();
- if (!tmp.empty())
+ if ( pkg )
{
- info->add(YCPString("path"), YCPString(tmp));
- }
-
- tmp = pkg->location().filename().basename();
- if (!tmp.empty())
- {
- info->add(YCPString("location"), YCPString(tmp));
- }
+ 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", (*it)->name() );
+ }
}
// product specific info
else if( req_kind == "product" ) {
zypp::Product::constPtr product = boost::dynamic_pointer_cast<const zypp::Product>(it->resolvable());
+ if ( !product )
+ {
+ y2error("product %s is not a product", (*it)->name() );
+ continue;
+ }
#warning "Product::category is deprecated, remove from YCP code and this map"
info->add(YCPString("category"), YCPString(product->type()));
info->add(YCPString("type"), YCPString(product->type()));
@@ -327,7 +337,7 @@
else if ( req_kind == "patch" )
{
zypp::Patch::constPtr patch_ptr = boost::dynamic_pointer_cast<const zypp::Patch>(it->resolvable());
-
+
info->add(YCPString("interactive"), YCPBoolean(patch_ptr->interactive()));
info->add(YCPString("reboot_needed"), YCPBoolean(patch_ptr->reboot_needed()));
info->add(YCPString("affects_pkg_manager"), YCPBoolean(patch_ptr->affects_pkg_manager()));
@@ -363,7 +373,7 @@
ycpdep->add (YCPString ("dep_kind"), YCPString (*kind_it));
ycpdeps->add (ycpdep);
}
-
+
}
catch (...)
{}
@@ -411,7 +421,7 @@
}
else if ( req_kind == "any" ) {
try
- {
+ {
for (zypp::ResPool::const_iterator it = zypp_ptr()->pool().begin();
it != zypp_ptr()->pool().end();
++it)
@@ -432,7 +442,7 @@
return YCPNull();
}
- return YCPBoolean(false);
+ return YCPBoolean(false);
}
else
{
@@ -442,7 +452,7 @@
try
- {
+ {
for (zypp::ResPool::byKind_iterator it = zypp_ptr()->pool().byKindBegin(kind);
it != zypp_ptr()->pool().byKindEnd(kind);
++it)
@@ -463,6 +473,6 @@
return YCPNull();
}
- return YCPBoolean(false);
+ return YCPBoolean(false);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-pkg-bindings-2.16.27/VERSION new/yast2-pkg-bindings-2.16.28/VERSION
--- old/yast2-pkg-bindings-2.16.27/VERSION 2008-04-15 16:29:44.000000000 +0200
+++ new/yast2-pkg-bindings-2.16.28/VERSION 2008-04-16 18:21:18.000000000 +0200
@@ -1 +1 @@
-2.16.27
+2.16.28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org