Hello community,
here is the log from the commit of package yast2-pkg-bindings
checked in at Thu Apr 13 17:14:16 CEST 2006.
--------
--- yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-10 17:54:50.000000000 +0200
+++ STABLE/yast2-pkg-bindings/yast2-pkg-bindings.changes 2006-04-13 13:21:50.000000000 +0200
@@ -1,0 +2,10 @@
+Thu Apr 13 13:00:00 CEST 2006 - lslezak@suse.cz
+
+- fixed disk usage counting - non-root dirs should not contain
+ / at the beginning (#163199)
+- updated Pkg::ResolvablePreselectPatches - return number of
+ patches, added 'kind' argument (#165540)
+- new binding Pkg::CallbackAcceptFileWithoutChecksum() (#165125)
+- 2.13.58
+
+-------------------------------------------------------------------
Old:
----
yast2-pkg-bindings-2.13.57.tar.bz2
New:
----
yast2-pkg-bindings-2.13.58.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-pkg-bindings.spec ++++++
--- /var/tmp/diff_new_pack.ctudNa/_old 2006-04-13 17:14:00.000000000 +0200
+++ /var/tmp/diff_new_pack.ctudNa/_new 2006-04-13 17:14:00.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-pkg-bindings (Version 2.13.57)
+# spec file for package yast2-pkg-bindings (Version 2.13.58)
#
# 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.57
+Version: 2.13.58
Release: 1
License: GPL
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-pkg-bindings-2.13.57.tar.bz2
+Source0: yast2-pkg-bindings-2.13.58.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 libzypp libzypp-devel perl-XML-Writer rpm-devel sgml-skel yast2-core-devel yast2-devtools
Summary: YaST2 Package Manager Access
@@ -36,7 +36,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-pkg-bindings-2.13.57
+%setup -n yast2-pkg-bindings-2.13.58
%build
%{prefix}/bin/y2tool y2autoconf
@@ -67,6 +67,13 @@
%doc %{prefix}/share/doc/packages/yast2-pkg-bindings
%changelog -n yast2-pkg-bindings
+* Thu Apr 13 2006 - lslezak@suse.cz
+- fixed disk usage counting - non-root dirs should not contain
+ / at the beginning (#163199)
+- updated Pkg::ResolvablePreselectPatches - return number of
+ patches, added 'kind' argument (#165540)
+- new binding Pkg::CallbackAcceptFileWithoutChecksum() (#165125)
+- 2.13.58
* Mon Apr 10 2006 - jsrain@suse.de
- call PkgRefresh when added or enabled a source (#156980)
- 2.13.57
++++++ yast2-pkg-bindings-2.13.57.tar.bz2 -> yast2-pkg-bindings-2.13.58.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/Makefile.in new/yast2-pkg-bindings-2.13.58/Makefile.in
--- old/yast2-pkg-bindings-2.13.57/Makefile.in 2006-04-10 17:52:51.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/Makefile.in 2006-04-13 10:46:17.000000000 +0200
@@ -151,6 +151,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -168,12 +169,15 @@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
YDOXYGEN = @YDOXYGEN@
+ZYPP_CFLAGS = @ZYPP_CFLAGS@
+ZYPP_LIBS = @ZYPP_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
agentdir = @agentdir@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/VERSION new/yast2-pkg-bindings-2.13.58/VERSION
--- old/yast2-pkg-bindings-2.13.57/VERSION 2006-04-10 17:49:08.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/VERSION 2006-04-13 10:45:52.000000000 +0200
@@ -1 +1 @@
-2.13.57
+2.13.58
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/aclocal.m4 new/yast2-pkg-bindings-2.13.58/aclocal.m4
--- old/yast2-pkg-bindings-2.13.57/aclocal.m4 2006-04-10 17:52:43.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/aclocal.m4 2006-04-13 10:46:08.000000000 +0200
@@ -7242,6 +7242,163 @@
AC_MSG_RESULT([$SED])
])
+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+#
+# Copyright © 2004 Scott James Remnant .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=m4_default([$1], [0.9.0])
+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ PKG_CONFIG=""
+ fi
+
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists. Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+ m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+ $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+ if test -n "$$1"; then
+ pkg_cv_[]$1="$$1"
+ else
+ PKG_CHECK_EXISTS([$3],
+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+ [pkg_failed=yes])
+ fi
+else
+ pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+ _PKG_SHORT_ERRORS_SUPPORTED
+ if test $_pkg_short_errors_supported = yes; then
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+ else
+ $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+ ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+ [$4])
+elif test $pkg_failed = untried; then
+ ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.])],
+ [$4])
+else
+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+ AC_MSG_RESULT([yes])
+ ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
dnl check for docbook
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/configure new/yast2-pkg-bindings-2.13.58/configure
--- old/yast2-pkg-bindings-2.13.57/configure 2006-04-10 17:52:45.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/configure 2006-04-13 10:46:11.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.57.
+# Generated by GNU Autoconf 2.59 for yast2-pkg-bindings 2.13.58.
#
# Report bugs to http://www.suse.de/feedback.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-pkg-bindings'
PACKAGE_TARNAME='yast2-pkg-bindings'
-PACKAGE_VERSION='2.13.57'
-PACKAGE_STRING='yast2-pkg-bindings 2.13.57'
+PACKAGE_VERSION='2.13.58'
+PACKAGE_STRING='yast2-pkg-bindings 2.13.58'
PACKAGE_BUGREPORT='http://www.suse.de/feedback'
ac_unique_file="RPMNAME"
@@ -466,7 +466,7 @@
# include
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA XSLTPROC have_xsltproc_TRUE have_xsltproc_FALSE XML_CATALOG XSLTPROC_FLAGS DOCBOOK_ROOT CAT_ENTRY_START CAT_ENTRY_END LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar RPMNAME MAINTAINER pkgconfigdir pkgconfigdatadir yast2dir ybindir ystartupdir plugindir potdir execcompdir docdir ydatadir imagedir themedir localedir clientdir moduledir yncludedir schemadir scrconfdir agentdir desktopdir fillupdir LN_S PKG_CONFIG_PATH XGETTEXT CREATE_PKGCONFIG_TRUE CREATE_PKGCONFIG_F
ALSE CREATE_PKGCONFIG_NOARCH_TRUE CREATE_PKGCONFIG_NOARCH_FALSE STYLESHEET_HTML STYLESHEET_PDF STYLESHEET_CSS STYLESHEET_YDOC STYLESHEET_YCPDOC YDOXYGEN CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP AGENT_LIBADD EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA PKG_CONFIG ac_pt_PKG_CONFIG ZYPP_CFLAGS ZYPP_LIBS XSLTPROC have_xsltproc_TRUE have_xsltproc_FALSE XML_CATALOG XSLTPROC_FLAGS DOCBOOK_ROOT CAT_ENTRY_START CAT_ENTRY_END LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -951,6 +951,18 @@
ac_env_FFLAGS_value=$FFLAGS
ac_cv_env_FFLAGS_set=${FFLAGS+set}
ac_cv_env_FFLAGS_value=$FFLAGS
+ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
+ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
+ac_env_ZYPP_CFLAGS_set=${ZYPP_CFLAGS+set}
+ac_env_ZYPP_CFLAGS_value=$ZYPP_CFLAGS
+ac_cv_env_ZYPP_CFLAGS_set=${ZYPP_CFLAGS+set}
+ac_cv_env_ZYPP_CFLAGS_value=$ZYPP_CFLAGS
+ac_env_ZYPP_LIBS_set=${ZYPP_LIBS+set}
+ac_env_ZYPP_LIBS_value=$ZYPP_LIBS
+ac_cv_env_ZYPP_LIBS_set=${ZYPP_LIBS+set}
+ac_cv_env_ZYPP_LIBS_value=$ZYPP_LIBS
#
# Report the --help message.
@@ -959,7 +971,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.57 to adapt to many kinds of systems.
+\`configure' configures yast2-pkg-bindings 2.13.58 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1026,7 +1038,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.57:";;
+ short | recursive ) echo "Configuration of yast2-pkg-bindings 2.13.58:";;
esac
cat <<\_ACEOF
@@ -1069,6 +1081,9 @@
CXXCPP C++ preprocessor
F77 Fortran 77 compiler command
FFLAGS Fortran 77 compiler flags
+ PKG_CONFIG path to pkg-config utility
+ ZYPP_CFLAGS C compiler flags for ZYPP, overriding pkg-config
+ ZYPP_LIBS linker flags for ZYPP, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1169,7 +1184,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-yast2-pkg-bindings configure 2.13.57
+yast2-pkg-bindings configure 2.13.58
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1183,7 +1198,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.57, which was
+It was created by yast2-pkg-bindings $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1913,7 +1928,7 @@
# Define the identity of the package.
PACKAGE='yast2-pkg-bindings'
- VERSION='2.13.57'
+ VERSION='2.13.58'
cat >>confdefs.h <<_ACEOF
@@ -2124,7 +2139,7 @@
-VERSION="2.13.57"
+VERSION="2.13.58"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -4858,7 +4873,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4861 "configure"' > conftest.$ac_ext
+ echo '#line 4876 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5759,7 +5774,7 @@
# Provide some information about the compiler.
-echo "$as_me:5762:" \
+echo "$as_me:5777:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5
@@ -6822,11 +6837,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6825: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6840: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6829: \$? = $ac_status" >&5
+ echo "$as_me:6844: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7090,11 +7105,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7093: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7108: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7097: \$? = $ac_status" >&5
+ echo "$as_me:7112: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7194,11 +7209,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7197: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7212: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7201: \$? = $ac_status" >&5
+ echo "$as_me:7216: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9539,7 +9554,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:11997: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11986: \$? = $ac_status" >&5
+ echo "$as_me:12001: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12083,11 +12098,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12086: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12101: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12090: \$? = $ac_status" >&5
+ echo "$as_me:12105: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13653,11 +13668,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13656: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13671: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13660: \$? = $ac_status" >&5
+ echo "$as_me:13675: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13757,11 +13772,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13760: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13775: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13764: \$? = $ac_status" >&5
+ echo "$as_me:13779: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15960,11 +15975,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15978: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15967: \$? = $ac_status" >&5
+ echo "$as_me:15982: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16228,11 +16243,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16231: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16246: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16235: \$? = $ac_status" >&5
+ echo "$as_me:16250: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16332,11 +16347,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16335: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16350: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16339: \$? = $ac_status" >&5
+ echo "$as_me:16354: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19531,6 +19546,222 @@
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+
+if test -n "$PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+ ac_pt_PKG_CONFIG=$PKG_CONFIG
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $ac_pt_PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+
+ ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+
+if test -n "$ac_pt_PKG_CONFIG"; then
+ echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
+echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+ PKG_CONFIG=$ac_pt_PKG_CONFIG
+else
+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+ _pkg_min_version=0.9.0
+ echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
+echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ PKG_CONFIG=""
+ fi
+
+fi
+
+pkg_failed=no
+echo "$as_me:$LINENO: checking for ZYPP" >&5
+echo $ECHO_N "checking for ZYPP... $ECHO_C" >&6
+
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ZYPP_CFLAGS"; then
+ pkg_cv_ZYPP_CFLAGS="$ZYPP_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libzypp\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libzypp") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ZYPP_CFLAGS=`$PKG_CONFIG --cflags "libzypp" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$ZYPP_LIBS"; then
+ pkg_cv_ZYPP_LIBS="$ZYPP_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libzypp\"") >&5
+ ($PKG_CONFIG --exists --print-errors "libzypp") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_ZYPP_LIBS=`$PKG_CONFIG --libs "libzypp" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ fi
+else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ ZYPP_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libzypp"`
+ else
+ ZYPP_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libzypp"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$ZYPP_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (libzypp) were not met:
+
+$ZYPP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ZYPP_CFLAGS
+and ZYPP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (libzypp) were not met:
+
+$ZYPP_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables ZYPP_CFLAGS
+and ZYPP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
+ { (exit 1); exit 1; }; }
+elif test $pkg_failed = untried; then
+ { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ZYPP_CFLAGS
+and ZYPP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.
+See \`config.log' for more details." >&5
+echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables ZYPP_CFLAGS
+and ZYPP_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see http://www.freedesktop.org/software/pkgconfig.
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ ZYPP_CFLAGS=$pkg_cv_ZYPP_CFLAGS
+ ZYPP_LIBS=$pkg_cv_ZYPP_LIBS
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ :
+fi
+
+
# It's just rude to go over the net to build
XSLTPROC_FLAGS=--nonet
DOCBOOK_ROOT=
@@ -20042,7 +20273,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by yast2-pkg-bindings $as_me 2.13.57, which was
+This file was extended by yast2-pkg-bindings $as_me 2.13.58, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20105,7 +20336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-pkg-bindings config.status 2.13.57
+yast2-pkg-bindings config.status 2.13.58
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -20413,6 +20644,10 @@
s,@ac_ct_F77@,$ac_ct_F77,;t t
s,@LIBTOOL@,$LIBTOOL,;t t
s,@ALLOCA@,$ALLOCA,;t t
+s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
+s,@ZYPP_CFLAGS@,$ZYPP_CFLAGS,;t t
+s,@ZYPP_LIBS@,$ZYPP_LIBS,;t t
s,@XSLTPROC@,$XSLTPROC,;t t
s,@have_xsltproc_TRUE@,$have_xsltproc_TRUE,;t t
s,@have_xsltproc_FALSE@,$have_xsltproc_FALSE,;t t
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/configure.in new/yast2-pkg-bindings-2.13.58/configure.in
--- old/yast2-pkg-bindings-2.13.57/configure.in 2006-04-10 17:52:34.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/configure.in 2006-04-13 10:45:57.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-pkg-bindings, 2.13.57, http://www.suse.de/feedback, yast2-pkg-bindings)
+AC_INIT(yast2-pkg-bindings, 2.13.58, http://www.suse.de/feedback, 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.57"
+VERSION="2.13.58"
RPMNAME="yast2-pkg-bindings"
MAINTAINER="Michael Andres "
@@ -158,6 +158,7 @@
AC_HEADER_STDC
+PKG_CHECK_MODULES([ZYPP], [libzypp])
AX_CHECK_DOCBOOK
AC_CONFIG_FILES(Makefile doc/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/doc/Makefile.in new/yast2-pkg-bindings-2.13.58/doc/Makefile.in
--- old/yast2-pkg-bindings-2.13.57/doc/Makefile.in 2006-04-10 17:52:50.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/doc/Makefile.in 2006-04-13 10:46:16.000000000 +0200
@@ -120,6 +120,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -137,12 +138,15 @@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
YDOXYGEN = @YDOXYGEN@
+ZYPP_CFLAGS = @ZYPP_CFLAGS@
+ZYPP_LIBS = @ZYPP_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
agentdir = @agentdir@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/pkg-bindings.pot new/yast2-pkg-bindings-2.13.58/pkg-bindings.pot
--- old/yast2-pkg-bindings-2.13.57/pkg-bindings.pot 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-pkg-bindings-2.13.58/pkg-bindings.pot 2006-03-27 16:52:32.000000000 +0200
@@ -0,0 +1,21 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR SuSE Linux Products GmbH, Nuernberg
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-03-27 16:52+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/Package.cc:1669 src/Package.cc:1729
+msgid "See /var/log/YaST2/badlist for more information."
+msgstr ""
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/Callbacks.YCP.h new/yast2-pkg-bindings-2.13.58/src/Callbacks.YCP.h
--- old/yast2-pkg-bindings-2.13.57/src/Callbacks.YCP.h 2006-04-05 17:52:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/Callbacks.YCP.h 2006-04-13 09:41:18.000000000 +0200
@@ -85,6 +85,7 @@
CB_ImportGpgKey,
CB_AcceptUnknownGpgKey,
CB_AcceptUnsignedFile,
+ CB_AcceptFileWithoutChecksum,
CB_AcceptVerificationFailed,
CB_TrustedKeyAdded,
CB_TrustedKeyRemoved
@@ -132,6 +133,7 @@
ENUM_OUT( AcceptUnknownGpgKey );
ENUM_OUT( AcceptUnsignedFile );
ENUM_OUT( AcceptVerificationFailed );
+ ENUM_OUT( AcceptFileWithoutChecksum );
ENUM_OUT( TrustedKeyAdded );
ENUM_OUT( TrustedKeyRemoved );
#undef ENUM_OUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/Callbacks.cc new/yast2-pkg-bindings-2.13.58/src/Callbacks.cc
--- old/yast2-pkg-bindings-2.13.57/src/Callbacks.cc 2006-04-10 17:33:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/Callbacks.cc 2006-04-12 09:00:04.000000000 +0200
@@ -868,6 +868,20 @@
return zypp::KeyRingReport::askUserToAcceptUnsignedFile(file);
}
+
+ virtual bool askUserToAcceptFileWithoutChecksum( const zypp::Pathname &file )
+ {
+ CB callback( ycpcb( YCPCallbacks::CB_AcceptFileWithoutChecksum) );
+
+ if (callback._set)
+ {
+ callback.addStr(file.asString());
+
+ return callback.evaluateBool();
+ }
+
+ return zypp::KeyRingReport::askUserToAcceptFileWithoutChecksum(file);
+ }
virtual bool askUserToAcceptVerificationFailed( const zypp::Pathname &file,
const std::string &keyid, const std::string &keyname )
@@ -1126,6 +1140,16 @@
}
/**
+ * @builtin CallbackAcceptFileWithoutChecksum
+ * @short Register callback function
+ * @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string filename)</code>. The callback function should ask user whether the unsigned file can be accepted, returned true value means to accept the file.
+ * @return void
+ */
+YCPValue PkgModuleFunctions::CallbackAcceptFileWithoutChecksum( const YCPString& args ) {
+ return SET_YCP_CB( CB_AcceptFileWithoutChecksum, args );
+}
+
+/**
* @builtin CallbackAcceptVerificationFailed
* @short Register callback function
* @param string args Name of the callback handler function. Required callback prototype is <code>boolean(string filename, string keyid, string keyname)</code>. The callback function should ask user whether the unsigned file can be accepted, returned true value means to accept the file.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/Makefile.in new/yast2-pkg-bindings-2.13.58/src/Makefile.in
--- old/yast2-pkg-bindings-2.13.57/src/Makefile.in 2006-04-10 17:52:50.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/Makefile.in 2006-04-13 10:46:16.000000000 +0200
@@ -59,7 +59,8 @@
am__installdirs = "$(DESTDIR)$(plugindir)"
pluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(plugin_LTLIBRARIES)
-libpy2Pkg_la_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+libpy2Pkg_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libpy2Pkg_la_OBJECTS = PkgError.lo Y2PkgComponent.lo Y2CCPkg.lo \
ycpTools.lo PkgModule.lo PkgModuleFunctions.lo Package.lo \
Patch.lo Resolvable.lo Selection.lo Target.lo Source.lo \
@@ -147,6 +148,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
RANLIB = @RANLIB@
RPMNAME = @RPMNAME@
@@ -164,12 +166,15 @@
XSLTPROC = @XSLTPROC@
XSLTPROC_FLAGS = @XSLTPROC_FLAGS@
YDOXYGEN = @YDOXYGEN@
+ZYPP_CFLAGS = @ZYPP_CFLAGS@
+ZYPP_LIBS = @ZYPP_LIBS@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
agentdir = @agentdir@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/Package.cc new/yast2-pkg-bindings-2.13.58/src/Package.cc
--- old/yast2-pkg-bindings-2.13.57/src/Package.cc 2006-04-10 17:33:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/Package.cc 2006-04-13 09:35:14.000000000 +0200
@@ -44,8 +44,8 @@
#include
#include
#include
-#include
-#include
+#include
+#include
#include
#include <fstream>
@@ -2118,7 +2118,9 @@
try
{
- result = zypp_ptr()->commit(medianr);
+ zypp::ZYppCommitPolicy policy;
+ policy.restrictToMedia( medianr );
+ result = zypp_ptr()->commit(policy);
}
catch (const zypp::target::TargetAbortedException & excpt)
{
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/PkgModuleFunctions.cc new/yast2-pkg-bindings-2.13.58/src/PkgModuleFunctions.cc
--- old/yast2-pkg-bindings-2.13.57/src/PkgModuleFunctions.cc 2006-03-29 19:33:25.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/PkgModuleFunctions.cc 2006-04-13 09:35:14.000000000 +0200
@@ -44,7 +44,7 @@
// exit
#include <cstdlib>
-class Y2PkgFunction: public Y2Function
+class Y2PkgFunction: public Y2Function
{
unsigned int m_position;
PkgModuleFunctions* m_instance;
@@ -55,7 +55,7 @@
string m_name;
public:
- Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos);
+ Y2PkgFunction (string name, PkgModuleFunctions* instance, unsigned int pos);
bool attachParameter (const YCPValue& arg, const int position);
constTypePtr wantedParameterType () const;
bool appendParameter (const YCPValue& arg);
@@ -76,27 +76,27 @@
, m_name (name)
{
};
-
+
bool Y2PkgFunction::attachParameter (const YCPValue& arg, const int position)
{
switch (position)
{
- case 0: m_param1 = arg; break;
- case 1: m_param2 = arg; break;
- case 2: m_param3 = arg; break;
- case 3: m_param4 = arg; break;
+ case 0: m_param1 = arg; break;
+ case 1: m_param2 = arg; break;
+ case 2: m_param3 = arg; break;
+ case 3: m_param4 = arg; break;
default: return false;
}
return true;
}
-
+
constTypePtr Y2PkgFunction::wantedParameterType () const
{
y2internal ("wantedParameterType not implemented");
return Type::Unspec;
}
-
+
bool Y2PkgFunction::appendParameter (const YCPValue& arg)
{
if (m_param1.isNull ())
@@ -119,13 +119,13 @@
y2internal ("appendParameter > 3 not implemented");
return false;
}
-
+
bool Y2PkgFunction::finishParameters ()
{
y2internal ("finishParameters not implemented");
return true;
}
-
+
YCPValue Y2PkgFunction::evaluateCall ()
{
ycpmilestone ("Pkg Builtin called: %s", name().c_str() );
@@ -133,10 +133,10 @@
switch (m_position) {
#include "PkgBuiltinCalls.h"
}
-
+
return YCPNull ();
}
-
+
bool Y2PkgFunction::reset ()
{
m_param1 = YCPNull ();
@@ -225,7 +225,7 @@
y2error ("No such function %s", name.c_str ());
return NULL;
}
-
+
return new Y2PkgFunction (name, this, it - _registered_functions.begin ());
}
@@ -275,7 +275,7 @@
/**
- * @builtin SetLocale
+ * @builtin SetLocale
* @short Set Prefered Locale
* @description
* set the given locale as the "preferred" locale
@@ -359,9 +359,9 @@
* @builtin GetAdditionalLocales
*
* @short return list of additional locales
- * @return list<string>
+ * @return list<string>
* @usage Pkg::GetAdditionalLocales() -> ["de_DE"];
- *
+ *
*/
YCPValue
PkgModuleFunctions::GetAdditionalLocales ()
@@ -444,15 +444,13 @@
{
try {
zypp::SourceManager::sourceManager()->reset();
-
- zypp_ptr()->reset();
}
catch( const zypp::Exception & expt )
{
y2error( "Initialization of libzypp failed" );
return YCPBoolean(false);
}
-
+
return YCPBoolean(true);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-pkg-bindings-2.13.57/src/PkgModuleFunctions.h new/yast2-pkg-bindings-2.13.58/src/PkgModuleFunctions.h
--- old/yast2-pkg-bindings-2.13.57/src/PkgModuleFunctions.h 2006-04-10 17:33:30.000000000 +0200
+++ new/yast2-pkg-bindings-2.13.58/src/PkgModuleFunctions.h 2006-04-13 10:08:21.000000000 +0200
@@ -197,6 +197,8 @@
YCPValue CallbackTrustedKeyAdded( const YCPString& func );
/* TYPEINFO: void(string) */
YCPValue CallbackTrustedKeyRemoved( const YCPString& func );
+ /* TYPEINFO: void(string) */
+ YCPValue CallbackAcceptFileWithoutChecksum( const YCPString& func );
// source related
/* TYPEINFO: boolean(boolean)*/
@@ -439,8 +441,8 @@
YCPValue ResolvableProperties(const YCPString& name, const YCPSymbol& kind_r, const YCPString& version);
/* TYPEINFO: list