Hello community, here is the log from the commit of package yast2-pkg-bindings checked in at Mon Oct 30 18:06:14 CET 2006. -------- --- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-20 17:06:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-10-30 14:55:37.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Oct 30 14:36:38 CET 2006 - lslezak@suse.cz + +- return OPTIONALURLS and EXTRAURLS properties of a Product + resolvable (#213031) +- ResolvableProperties() supports resolvable type `language +- 2.13.101 + +------------------------------------------------------------------- Old: ---- yast2-pkg-bindings-2.13.100.tar.bz2 New: ---- yast2-pkg-bindings-2.13.101.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-pkg-bindings.spec ++++++ --- /var/tmp/diff_new_pack.hAw3lI/_old 2006-10-30 18:05:56.000000000 +0100 +++ /var/tmp/diff_new_pack.hAw3lI/_new 2006-10-30 18:05:56.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-pkg-bindings (Version 2.13.100) +# spec file for package yast2-pkg-bindings (Version 2.13.101) # # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-pkg-bindings -Version: 2.13.100 +Version: 2.13.101 Release: 1 -License: Other License(s), see package +License: GNU General Public License (GPL) - all versions Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-pkg-bindings-2.13.100.tar.bz2 +Source0: yast2-pkg-bindings-2.13.101.tar.bz2 prefix: /usr BuildRequires: blocxx-devel boost boost-devel dbus-1-devel docbook-xsl-stylesheets doxygen gcc-c++ hal-devel libgcrypt-devel libxcrypt-devel libxslt perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools BuildRequires: libzypp-devel >= 2.4.0 @@ -40,7 +40,7 @@ Stanislav Visnovsky <visnov@suse.cz> %prep -%setup -n yast2-pkg-bindings-2.13.100 +%setup -n yast2-pkg-bindings-2.13.101 %build %{prefix}/bin/y2tool y2autoconf @@ -71,6 +71,11 @@ %doc %{prefix}/share/doc/packages/yast2-pkg-bindings %changelog -n yast2-pkg-bindings +* Mon Oct 30 2006 - lslezak@suse.cz +- return OPTIONALURLS and EXTRAURLS properties of a Product + resolvable (#213031) +- ResolvableProperties() supports resolvable type `language +- 2.13.101 * Fri Oct 20 2006 - lslezak@suse.cz - added missing YCP callback evaluation (#213628) - DoneProvide callback - pass file name argument, ++++++ yast2-pkg-bindings-2.13.100.tar.bz2 -> yast2-pkg-bindings-2.13.101.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/VERSION new/yast2-pkg-bindings-2.13.101/VERSION --- old/yast2-pkg-bindings-2.13.100/VERSION 2006-10-20 16:46:51.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/VERSION 2006-10-30 14:46:46.000000000 +0100 @@ -1 +1 @@ -2.13.100 +2.13.101 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/configure new/yast2-pkg-bindings-2.13.101/configure --- old/yast2-pkg-bindings-2.13.100/configure 2006-10-20 17:05:54.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/configure 2006-10-30 14:47:03.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.100. +# Generated by GNU Autoconf 2.60 for yast2-pkg-bindings 2.13.101. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='yast2-pkg-bindings' PACKAGE_TARNAME='yast2-pkg-bindings' -PACKAGE_VERSION='2.13.100' -PACKAGE_STRING='yast2-pkg-bindings 2.13.100' +PACKAGE_VERSION='2.13.101' +PACKAGE_STRING='yast2-pkg-bindings 2.13.101' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1428,7 +1428,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-pkg-bindings 2.13.100 to adapt to many kinds of systems. +\`configure' configures yast2-pkg-bindings 2.13.101 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1499,7 +1499,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.100:";; + short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.101:";; esac cat <<\_ACEOF @@ -1607,7 +1607,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-pkg-bindings configure 2.13.100 +yast2-pkg-bindings configure 2.13.101 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1621,7 +1621,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-pkg-bindings $as_me 2.13.100, which was +It was created by yast2-pkg-bindings $as_me 2.13.101, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2422,7 +2422,7 @@ # Define the identity of the package. PACKAGE='yast2-pkg-bindings' - VERSION='2.13.100' + VERSION='2.13.101' cat >>confdefs.h <<_ACEOF @@ -2649,7 +2649,7 @@ -VERSION="2.13.100" +VERSION="2.13.101" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" @@ -21609,7 +21609,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-pkg-bindings $as_me 2.13.100, which was +This file was extended by yast2-pkg-bindings $as_me 2.13.101, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21662,7 +21662,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2-pkg-bindings config.status 2.13.100 +yast2-pkg-bindings config.status 2.13.101 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/configure.in new/yast2-pkg-bindings-2.13.101/configure.in --- old/yast2-pkg-bindings-2.13.100/configure.in 2006-10-20 17:05:40.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/configure.in 2006-10-30 14:46:49.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.13.16 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-pkg-bindings, 2.13.100, http://bugs.opensuse.org/, yast2-pkg-bindings) +AC_INIT(yast2-pkg-bindings, 2.13.101, http://bugs.opensuse.org/, yast2-pkg-bindings) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -17,7 +17,7 @@ AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs dnl Important YaST2 variables -VERSION="2.13.100" +VERSION="2.13.101" RPMNAME="yast2-pkg-bindings" MAINTAINER="Ladislav Slezák <lslezak@suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.100/src/Resolvable.cc new/yast2-pkg-bindings-2.13.101/src/Resolvable.cc --- old/yast2-pkg-bindings-2.13.100/src/Resolvable.cc 2006-10-12 11:06:45.000000000 +0200 +++ new/yast2-pkg-bindings-2.13.101/src/Resolvable.cc 2006-10-30 13:17:18.000000000 +0100 @@ -37,6 +37,7 @@ #include <zypp/Product.h> #include <zypp/Patch.h> #include <zypp/Pattern.h> +#include <zypp/Language.h> #include <zypp/base/PtrTypes.h> #include <zypp/Dep.h> #include <zypp/CapSet.h> @@ -297,7 +298,7 @@ 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, `selection or `pattern + @param kind_r kind of resolvable, can be `product, `patch, `package, `selection, `pattern or `language @param version version of the resolvable, if empty all versions are returned @return list<map<string,any>> list of $[ "name":string, "version":string, "arch":string, "source":integer, "status":symbol ] maps @@ -310,6 +311,13 @@ return ResolvablePropertiesEx (name, kind_r, version, false); } +/* + @builtin ResolvableDependencies + @description + return list of resolvables with dependencies + + @see ResolvableProperties for more information +*/ YCPValue PkgModuleFunctions::ResolvableDependencies(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version) { @@ -340,6 +348,9 @@ else if ( req_kind == "pattern" ) { kind = zypp::ResTraits<zypp::Pattern>::kind; } + else if ( req_kind == "language" ) { + kind = zypp::ResTraits<zypp::Language>::kind; + } else { y2error("Pkg::ResolvableProperties: unknown symbol: %s", req_kind.c_str()); @@ -433,6 +444,28 @@ flags->add(YCPString(*flag_it)); } info->add(YCPString("flags"), flags); + + std::list<zypp::Url> pextraUrls = product->extraUrls(); + if (pextraUrls.size() > 0) + { + YCPList extraUrls; + for (std::list<zypp::Url>::const_iterator it = pextraUrls.begin(); it != pextraUrls.end(); ++it) + { + extraUrls->add(YCPString(it->asString())); + } + info->add(YCPString("extra_urls"), extraUrls); + } + + std::list<zypp::Url> poptionalUrls = product->optionalUrls(); + if (poptionalUrls.size() > 0) + { + YCPList optionalUrls; + for (std::list<zypp::Url>::const_iterator it = poptionalUrls.begin(); it != poptionalUrls.end(); ++it) + { + optionalUrls->add(YCPString(it->asString())); + } + info->add(YCPString("optional_urls"), optionalUrls); + } } // pattern specific info ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@suse.de