Mailinglist Archive: opensuse-commit (2092 mails)

< Previous Next >
commit libzypp
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Thu, 16 Aug 2007 18:18:58 +0200
  • Message-id: <20070816161859.20A41678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package libzypp
checked in at Thu Aug 16 18:18:58 CEST 2007.

--------
--- libzypp/libzypp.changes     2007-08-15 19:28:10.000000000 +0200
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes        2007-08-16 17:29:09.629116000 +0200
@@ -1,0 +2,37 @@
+Thu Aug 16 17:21:52 CEST 2007 - kkaempf@xxxxxxx
+
+- discard pattern files with incompatbile architecture, both
+  for download and for parsing. (#298716)
+- rev 6711
+
+-------------------------------------------------------------------
+Thu Aug 16 17:12:45 CEST 2007 - kkaempf@xxxxxxx
+
+- run sqlite asynchronously and add sql index files where
+  appropriate, gives 6x performance on certain operations.
+  Bumping cache schema version to 1004.
+  (#300998)
+- rev 6710
+
+-------------------------------------------------------------------
+Thu Aug 16 17:08:58 CEST 2007 - kkaempf@xxxxxxx
+
+- fix String::endsWith (#301038)
+- rev 6709
+
+-------------------------------------------------------------------
+Thu Aug 16 11:16:25 CEST 2007 - schubi@xxxxxxx
+
+- added an _explicitly_requested in QueueItemConflict ( as already in
+  QueueItemEstablish, QueueItemInstall, QueueItemUninstall ) in order to
+  remove the conflicting item without an error message. Bug 299819 
+- rev 6699
+
+-------------------------------------------------------------------
+Thu Aug 16 07:23:31 CEST 2007 - jkupec@xxxxxxx
+
+- forgot to set default refresh policy in checkIfToRefreshMetadata
+- repo.refresh.delay default set to 10 minutes
+- 6693
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.i15042/_old  2007-08-16 18:18:30.000000000 +0200
+++ /var/tmp/diff_new_pack.i15042/_new  2007-08-16 18:18:30.000000000 +0200
@@ -17,7 +17,7 @@
 Autoreqprov:    on
 Summary:        Package, Patch, Pattern, and Product Management
 Version:        3.15.0
-Release:        1
+Release:        2
 Source:         libzypp-3.15.0.tar.bz2
 Source1:        libzypp-rpmlintrc
 Prefix:         /usr
@@ -125,6 +125,28 @@
 %{_libdir}/pkgconfig/libzypp.pc
 
 %changelog
+* Thu Aug 16 2007 - kkaempf@xxxxxxx
+- discard pattern files with incompatbile architecture, both
+  for download and for parsing. (#298716)
+- rev 6711
+* Thu Aug 16 2007 - kkaempf@xxxxxxx
+- run sqlite asynchronously and add sql index files where
+  appropriate, gives 6x performance on certain operations.
+  Bumping cache schema version to 1004.
+  (#300998)
+- rev 6710
+* Thu Aug 16 2007 - kkaempf@xxxxxxx
+- fix String::endsWith (#301038)
+- rev 6709
+* Thu Aug 16 2007 - schubi@xxxxxxx
+- added an _explicitly_requested in QueueItemConflict ( as already in
+  QueueItemEstablish, QueueItemInstall, QueueItemUninstall ) in order to
+  remove the conflicting item without an error message. Bug 299819
+- rev 6699
+* Thu Aug 16 2007 - jkupec@xxxxxxx
+- forgot to set default refresh policy in checkIfToRefreshMetadata
+- repo.refresh.delay default set to 10 minutes
+- 6693
 * Wed Aug 15 2007 - schubi@xxxxxxx
 - Bugfix while regarding correct vendor in update
 - r6677

++++++ libzypp-3.15.0.tar.bz2 ++++++
++++ 4727 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/libzypp-3.15.0/devel/genclass new/libzypp-3.15.0/devel/genclass
--- old/libzypp-3.15.0/devel/genclass   2007-08-15 19:21:45.000000000 +0200
+++ new/libzypp-3.15.0/devel/genclass   1970-01-01 01:00:00.000000000 +0100
@@ -1,229 +0,0 @@
-#! /bin/bash
-
-function usage() {
-   echo $@ >&2
-   echo <<EOF >&2
-Usage: genclass [path/]stem
-EOF
-   exit 1
-}
-
-test -z "$1" && usage "Missing name!"
-
-TOPSRCDIR=$( cd /local/jkupec/eclipse/trunk/libzypp && pwd )
-test -z "$TOPSRCDIR" && {
-   echo "Dir does not exist '/local/jkupec/eclipse/trunk/libzypp'" >&2
-   exit 1
-}
-
-OUTDIR=$(dirname $1)
-STEM=$(basename $1)
-STEMDIR=$( cd $OUTDIR && pwd )
-test -z "$STEMDIR" && {
-   echo "Dir does not exist '$(dirname $1)'" >&2
-   exit 1
-}
-STEMDIR=${STEMDIR#$TOPSRCDIR/}
-
-CLASS=$STEM
-CLASS_H=$STEMDIR/$STEM.h
-CLASS_CC=$STEMDIR/$STEM.cc
-
-OUT_CLASS_H=$OUTDIR/$STEM.h
-OUT_CLASS_CC=$OUTDIR/$STEM.cc
-test -e $OUT_CLASS_H -o -e $OUT_CLASS_CC && {
-   test -e $OUT_CLASS_H && echo "File exists '$OUT_CLASS_H' using '$OUT_CLASS_H.new'" >&2
-   test -e $OUT_CLASS_CC && echo "File exists '$OUT_CLASS_CC' using '$OUT_CLASS_CC.new'" >&2
-   OUT_CLASS_H="$OUT_CLASS_H.new"
-   OUT_CLASS_CC="$OUT_CLASS_CC.new"
-}
-
-INCLUDE_H=$CLASS_H
-INCLUDE_DEF=$(echo $INCLUDE_H | sed 's/[./]/_/g' | awk '{print toupper($0)}')
-NSLIST=$(echo $(dirname $INCLUDE_H) | awk '{l=tolower($0);gsub("/"," ",l);print l}')
-SNLIST=
-INDENT=
-for N in $NSLIST; do
-   SNLIST="$N $SNLIST"
-   INDENT="$INDENT  "
-done
-
-######################################################################
-function intro() {
-######################################################################
-   local FILE=$1
-cat <<EOF
-/*---------------------------------------------------------------------\\
-|                          ____ _   __ __ ___                          |
-|                         |__  / \ / / . \ . \                         |
-|                           / / \ V /|  _/  _/                         |
-|                          / /__ | | | | | |                           |
-|                         /_____||_| |_| |_|                           |
-|                                                                      |
-\---------------------------------------------------------------------*/
-/** \file      ${FILE}
- *
-*/
-EOF
-}
-
-######################################################################
-function nsopen() {
-######################################################################
-   local I=
-   for N in $NSLIST; do
-      echo "${I}///////////////////////////////////////////////////////////////////"
-      echo "${I}namespace $N"
-      echo "${I}{ /////////////////////////////////////////////////////////////////"
-      I="$I  "
-   done
-}
-
-######################################################################
-function nsclose() {
-######################################################################
-   local I=${INDENT}
-   for N in $SNLIST; do
-      echo "${I}/////////////////////////////////////////////////////////////////"
-      I=${I#  }
-      echo "${I}} // namespace $N"
-      echo "${I}///////////////////////////////////////////////////////////////////"
-   done
-}
-
-######################################################################
-function genH() {
-######################################################################
-cat <<EOF
-$(intro $CLASS_H)
-#ifndef $INCLUDE_DEF
-#define $INCLUDE_DEF
-
-#include <iosfwd>
-
-#include "zypp/base/PtrTypes.h"
-
-$(nsopen)
-
-${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}//
-${INDENT}//    CLASS NAME : ${CLASS}
-${INDENT}//
-${INDENT}/** */
-${INDENT}class ${CLASS}
-${INDENT}{
-${INDENT}  friend std::ostream & operator<<( std::ostream & str, const ${CLASS} & obj );
-
-${INDENT}public:
-${INDENT}  /** Implementation  */
-${INDENT}  class Impl;
-
-${INDENT}public:
-${INDENT}  /** Default ctor */
-${INDENT}  ${CLASS}();
-${INDENT}  /** Dtor */
-${INDENT}  ~${CLASS}();
-
-${INDENT}public:
-
-${INDENT}private:
-${INDENT}  /** Pointer to implementation */
-${INDENT}  RWCOW_pointer<Impl> _pimpl;
-${INDENT}};
-${INDENT}///////////////////////////////////////////////////////////////////
-
-${INDENT}/** \relates ${CLASS} Stream output */
-${INDENT}std::ostream & operator<<( std::ostream & str, const ${CLASS} & obj );
-
-$(nsclose)
-#endif // $INCLUDE_DEF
-EOF
-}
-
-######################################################################
-function genCC() {
-######################################################################
-cat <<EOF
-$(intro $CLASS_CC)
-#include <iostream>
-//#include "zypp/base/Logger.h"
-
-#include "${INCLUDE_H}"
-
-using std::endl;
-
-$(nsopen)
-
-${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}//
-${INDENT}//    CLASS NAME : ${CLASS}::Impl
-${INDENT}//
-${INDENT}/** ${CLASS} implementation. */
-${INDENT}struct ${CLASS}::Impl
-${INDENT}{
-
-${INDENT}public:
-${INDENT}  /** Offer default Impl. */
-${INDENT}  static shared_ptr<Impl> nullimpl()
-${INDENT}  {
-${INDENT}    static shared_ptr<Impl> _nullimpl( new Impl );
-${INDENT}    return _nullimpl;
-${INDENT}  }
-
-${INDENT}private:
-${INDENT}  friend Impl * rwcowClone<Impl>( const Impl * rhs );
-${INDENT}  /** clone for RWCOW_pointer */
-${INDENT}  Impl * clone() const
-${INDENT}  { return new Impl( *this ); }
-${INDENT}};
-${INDENT}///////////////////////////////////////////////////////////////////
-
-${INDENT}/** \relates ${CLASS}::Impl Stream output */
-${INDENT}inline std::ostream & operator<<( std::ostream & str, const ${CLASS}::Impl & obj )
-${INDENT}{
-${INDENT}  return str << "${CLASS}::Impl";
-${INDENT}}
-
-${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}//
-${INDENT}//    CLASS NAME : ${CLASS}
-${INDENT}//
-${INDENT}///////////////////////////////////////////////////////////////////
-
-${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}//
-${INDENT}//    METHOD NAME : ${CLASS}::${CLASS}
-${INDENT}//    METHOD TYPE : Ctor
-${INDENT}//
-${INDENT}${CLASS}::${CLASS}()
-${INDENT}: _pimpl( Impl::nullimpl() )
-${INDENT}{}
-
-${INDENT}///////////////////////////////////////////////////////////////////
-${INDENT}//
-${INDENT}//    METHOD NAME : ${CLASS}::~${CLASS}
-${INDENT}//    METHOD TYPE : Dtor
-${INDENT}//
-${INDENT}${CLASS}::~${CLASS}()
-${INDENT}{}
-
-${INDENT}/******************************************************************
-${INDENT}**
-${INDENT}**    FUNCTION NAME : operator<<
-${INDENT}**    FUNCTION TYPE : std::ostream &
-${INDENT}*/
-${INDENT}std::ostream & operator<<( std::ostream & str, const ${CLASS} & obj )
-${INDENT}{
-${INDENT}  return str << *obj._pimpl;
-${INDENT}}
-
-$(nsclose)
-EOF
-}
-
-######################################################################
-######################################################################
-######################################################################
-
-genH >$OUT_CLASS_H
-genCC >$OUT_CLASS_CC
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/libzypp-3.15.0/examples/Makefile new/libzypp-3.15.0/examples/Makefile
--- old/libzypp-3.15.0/examples/Makefile        2007-08-15 19:21:45.000000000 +0200
+++ new/libzypp-3.15.0/examples/Makefile        1970-01-01 01:00:00.000000000 +0100
@@ -1,515 +0,0 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
-# examples/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-pkgdatadir = $(datadir)/zypp
-pkglibdir = $(libdir)/zypp
-pkgincludedir = $(includedir)/zypp
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = x86_64-suse-linux-gnu
-host_triplet = x86_64-suse-linux-gnu
-target_triplet = x86_64-suse-linux-gnu
-noinst_PROGRAMS = read_plaindir_source$(EXEEXT)
-subdir = examples
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/VERSION $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-       $(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-PROGRAMS = $(noinst_PROGRAMS)
-am_read_plaindir_source_OBJECTS = read_plaindir_source.$(OBJEXT)
-read_plaindir_source_OBJECTS = $(am_read_plaindir_source_OBJECTS)
-read_plaindir_source_LDADD = $(LDADD)
-read_plaindir_source_DEPENDENCIES =
-read_plaindir_source_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-       $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-       $(CXXFLAGS) $(read_plaindir_source_LDFLAGS) $(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-LTCXXCOMPILE = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-       $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-CXXLD = $(CXX)
-CXXLINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
-       --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-       $(LDFLAGS) -o $@
-SOURCES = $(read_plaindir_source_SOURCES)
-DIST_SOURCES = $(read_plaindir_source_SOURCES)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run aclocal-1.10
-ALLOCA = 
-AMTAR = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run autoconf
-AUTOHEADER = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run autoheader
-AUTOMAKE = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run automake-1.10
-AWK = gawk
-BUILD_INCLUDED_LIBINTL = no
-CATOBJEXT = .gmo
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2
-CFLAG_VISIBILITY = -fvisibility=hidden
-CPP = gcc -E
-CPPFLAGS = 
-CURL_CFLAGS =  
-CURL_LIBS = -lcurl -lidn -lssl -lcrypto -ldl -lz  
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS =  -g -O3 -Wall -Wformat -Woverloaded-virtual -D_LARGE_FILES= 
-CYGPATH_W = echo
-DATADIRNAME = share
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-DOCGEN = /usr/bin/doxygen
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = /usr/bin/grep -E
-EXEEXT = 
-F77 = 
-FFLAGS = 
-GENCAT = gencat
-GLIBC2 = yes
-GLIBC21 = yes
-GMSGFMT = /usr/bin/msgfmt
-GMSGFMT_015 = /usr/bin/msgfmt
-GREP = /usr/bin/grep
-HAL_CFLAGS = -DDBUS_API_SUBJECT_TO_CHANGE -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/include/hal  
-HAL_LDADD = 
-HAL_LIBS = -lgobject-2.0 -ldbus-glib-1 -lglib-2.0 -lhal-storage -lhal -ldbus-1  
-HAVE_ASPRINTF = 1
-HAVE_DOT = YES
-HAVE_POSIX_PRINTF = 1
-HAVE_SNPRINTF = 1
-HAVE_VISIBILITY = 1
-HAVE_WPRINTF = 0
-IDN_CFLAGS =  
-IDN_LIBS = -lidn  
-INSTALL = /usr/bin/install -c
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-INSTOBJEXT = .mo
-INTLBISON = bison
-INTLLIBS = 
-INTLOBJS = 
-INTL_LIBTOOL_SUFFIX_PREFIX = 
-INTL_MACOSX_LIBS = 
-LDFLAGS = 
-LFS_CFLAGS = -D_LARGE_FILES= 
-LIBICONV = 
-LIBINTL = 
-LIBMULTITHREAD = -lpthread
-LIBOBJS = 
-LIBPTH = 
-LIBS = 
-LIBTHREAD = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LIBZYPP_VERSION_INFO = -version-info 300:0:0
-LN_S = ln -s
-LTLIBICONV = 
-LTLIBINTL = 
-LTLIBMULTITHREAD = -lpthread
-LTLIBOBJS = 
-LTLIBPTH = 
-LTLIBTHREAD = 
-MAKEINFO = ${SHELL} /local/jkupec/eclipse/trunk/libzypp/missing --run makeinfo
-MKDIR_P = /bin/mkdir -p
-MSGFMT = /usr/bin/msgfmt
-MSGFMT_015 = /usr/bin/msgfmt
-MSGMERGE = /usr/bin/msgmerge
-MYRUNTEST = /usr/bin/runtest
-OBJEXT = o
-OPENSSL_CFLAGS =  
-OPENSSL_LIBS = -lssl -lcrypto -ldl -lz  
-PACKAGE = zypp
-PACKAGE_BUGREPORT = 
-PACKAGE_NAME = zypp
-PACKAGE_STRING = zypp 3.0.0
-PACKAGE_TARNAME = zypp
-PACKAGE_VERSION = 3.0.0
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-POSUB = po
-PRI_MACROS_BROKEN = 0
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-SQLITE_CFLAGS =  
-SQLITE_LIBS = -lsqlitezmd3  
-STRIP = strip
-USE_INCLUDED_LIBINTL = no
-USE_NLS = yes
-VERSION = 3.0.0
-WOE32DLL = no
-XGETTEXT = /usr/bin/xgettext
-XGETTEXT_015 = /usr/bin/xgettext
-ZYPP_CFLAGS = -D_LARGE_FILES=  
-ZYPP_FEATURES = LFS 
-abs_builddir = /local/jkupec/eclipse/trunk/libzypp/examples
-abs_srcdir = /local/jkupec/eclipse/trunk/libzypp/examples
-abs_top_builddir = /local/jkupec/eclipse/trunk/libzypp
-abs_top_srcdir = /local/jkupec/eclipse/trunk/libzypp
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = tar --format=ustar -chf - "$$tardir"
-am__untar = tar -xf -
-bindir = ${exec_prefix}/bin
-build = x86_64-suse-linux-gnu
-build_alias = 
-build_cpu = x86_64
-build_os = linux-gnu
-build_vendor = suse
-builddir = .
-datadir = ${datarootdir}
-datarootdir = ${prefix}/share
-docdir = ${datadir}/doc/packages
-dvidir = ${docdir}
-exec_prefix = ${prefix}
-host = x86_64-suse-linux-gnu
-host_alias = 
-host_cpu = x86_64
-host_os = linux-gnu
-host_vendor = suse
-htmldir = ${docdir}
-includedir = ${prefix}/include
-infodir = ${datarootdir}/info
-install_sh = $(SHELL) /local/jkupec/eclipse/trunk/libzypp/install-sh
-libdir = /local/jkupec/usr/lib64
-libexecdir = ${exec_prefix}/libexec
-localedir = /local/jkupec/usr/share/locale
-localstatedir = ${prefix}/var
-mandir = ${datarootdir}/man
-mkdir_p = /bin/mkdir -p
-oldincludedir = /usr/include
-pdfdir = ${docdir}
-pkgdocdir = ${docdir}/zypp
-prefix = /local/jkupec/usr
-program_transform_name = s,x,x,
-psdir = ${docdir}
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-srcdir = .
-sysconfdir = ${prefix}/etc
-target = x86_64-suse-linux-gnu
-target_alias = 
-target_cpu = x86_64
-target_os = linux-gnu
-target_vendor = suse
-top_builddir = ..
-top_srcdir = ..
-xmlstoreschemadir = /local/jkupec/usr/share/zypp/schema/xmlstore
-yumschemadir = /local/jkupec/usr/share/zypp/schema/yum
-zyppdir = /local/jkupec/usr/share/zypp
-INCLUDES = -I$(oldincludedir)/libxml2
-AM_LDFLAGS = 
-AM_CXXFLAGS = 
-# gperf:       -pg
-LDADD = -L$(top_srcdir)/zypp/.libs -lzypp -lboost_regex -lxml2 -lz
-read_plaindir_source_SOURCES = read_plaindir_source.cc
-read_plaindir_source_LDFLAGS = -static
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-       @for dep in $?; do \
-         case '$(am__configure_deps)' in \
-           *$$dep*) \
-             cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-               && exit 0; \
-             exit 1;; \
-         esac; \
-       done; \
-       echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
-       cd $(top_srcdir) && \
-         $(AUTOMAKE) --foreign  examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-       @case '$?' in \
-         *config.status*) \
-           cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-         *) \
-           echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-           cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-       esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-       cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstPROGRAMS:
-       @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-         f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-         echo " rm -f $$p $$f"; \
-         rm -f $$p $$f ; \
-       done
-read_plaindir_source$(EXEEXT): $(read_plaindir_source_OBJECTS) $(read_plaindir_source_DEPENDENCIES) 
-       @rm -f read_plaindir_source$(EXEEXT)
-       $(read_plaindir_source_LINK) $(read_plaindir_source_OBJECTS) $(read_plaindir_source_LDADD) $(LIBS)
-
-mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
-
-distclean-compile:
-       -rm -f *.tab.c
-
-include ./$(DEPDIR)/read_plaindir_source.Po
-
-.cc.o:
-       $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#      source='$<' object='$@' libtool=no \
-#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#      $(CXXCOMPILE) -c -o $@ $<
-
-.cc.obj:
-       $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-#      source='$<' object='$@' libtool=no \
-#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#      $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-
-.cc.lo:
-       $(LTCXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-       mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
-#      source='$<' object='$@' libtool=yes \
-#      DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) \
-#      $(LTCXXCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-       -rm -f *.lo
-
-clean-libtool:
-       -rm -rf .libs _libs
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-       list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-         test -n "$$unique" || unique=$$empty_fix; \
-         $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-           $$tags $$unique; \
-       fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-               $(TAGS_FILES) $(LISP)
-       tags=; \
-       here=`pwd`; \
-       list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-       unique=`for i in $$list; do \
-           if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-         done | \
-         $(AWK) '    { files[$$0] = 1; } \
-              END { for (i in files) print i; }'`; \
-       test -z "$(CTAGS_ARGS)$$tags$$unique" \
-         || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-            $$tags $$unique
-
-GTAGS:
-       here=`$(am__cd) $(top_builddir) && pwd` \
-         && cd $(top_srcdir) \
-         && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-       -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-       @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-       list='$(DISTFILES)'; \
-         dist_files=`for file in $$list; do echo $$file; done | \
-         sed -e "s|^$$srcdirstrip/||;t" \
-             -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-       case $$dist_files in \
-         */*) $(MKDIR_P) `echo "$$dist_files" | \
-                          sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-                          sort -u` ;; \
-       esac; \
-       for file in $$dist_files; do \
-         if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-         if test -d $$d/$$file; then \
-           dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-           if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-             cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-           fi; \
-           cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-         else \
-           test -f $(distdir)/$$file \
-           || cp -p $$d/$$file $(distdir)/$$file \
-           || exit 1; \
-         fi; \
-       done
-check-am: all-am
-check: check-am
-all-am: Makefile $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-       @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-       $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-         install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-         `test -z '$(STRIP)' || \
-           echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-       -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-       @echo "This command is intended for maintainers to use"
-       @echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
-       mostlyclean-am
-
-distclean: distclean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-       distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-info: install-info-am
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-       -rm -rf ./$(DEPDIR)
-       -rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-       mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am:
-
-.MAKE: install-am install-strip
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-       clean-libtool clean-noinstPROGRAMS ctags distclean \
-       distclean-compile distclean-generic distclean-libtool \
-       distclean-tags distdir dvi dvi-am html html-am info info-am \
-       install install-am install-data install-data-am install-dvi \
-       install-dvi-am install-exec install-exec-am install-html \
-       install-html-am install-info install-info-am install-man \
-       install-pdf install-pdf-am install-ps install-ps-am \
-       install-strip installcheck installcheck-am installdirs \
-       maintainer-clean maintainer-clean-generic mostlyclean \
-       mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-       pdf pdf-am ps ps-am tags uninstall uninstall-am
-
-
-.PHONY:        always
-
-$(noinst_PROGRAMS):    $(top_srcdir)/zypp/libzypp.la
-
-$(top_srcdir)/zypp/libzypp.la:     always
-       $(MAKE) -C $(top_srcdir)/zypp
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
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/libzypp-3.15.0/package/libzypp.changes new/libzypp-3.15.0/package/libzypp.changes
--- old/libzypp-3.15.0/package/libzypp.changes  2007-08-15 19:21:45.000000000 +0200
+++ new/libzypp-3.15.0/package/libzypp.changes  2007-08-16 17:26:55.000000000 +0200
@@ -1,4 +1,41 @@
 -------------------------------------------------------------------
+Thu Aug 16 17:21:52 CEST 2007 - kkaempf@xxxxxxx
+
+- discard pattern files with incompatbile architecture, both
+  for download and for parsing. (#298716)
+- rev 6711
+
+-------------------------------------------------------------------
+Thu Aug 16 17:12:45 CEST 2007 - kkaempf@xxxxxxx
+
+- run sqlite asynchronously and add sql index files where
+  appropriate, gives 6x performance on certain operations.
+  Bumping cache schema version to 1004.
+  (#300998)
+- rev 6710
+
+-------------------------------------------------------------------
+Thu Aug 16 17:08:58 CEST 2007 - kkaempf@xxxxxxx
+
+- fix String::endsWith (#301038)
+- rev 6709
+
+-------------------------------------------------------------------
+Thu Aug 16 11:16:25 CEST 2007 - schubi@xxxxxxx
+
+- added an _explicitly_requested in QueueItemConflict ( as already in
+  QueueItemEstablish, QueueItemInstall, QueueItemUninstall ) in order to
+  remove the conflicting item without an error message. Bug 299819 
+- rev 6699
+
+-------------------------------------------------------------------
+Thu Aug 16 07:23:31 CEST 2007 - jkupec@xxxxxxx
+
+- forgot to set default refresh policy in checkIfToRefreshMetadata
+- repo.refresh.delay default set to 10 minutes
+- 6693
+
+-------------------------------------------------------------------
 Wed Aug 15 15:32:36 CEST 2007 - schubi@xxxxxxx
 
 - Bugfix while regarding correct vendor in update
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/libzypp-3.15.0/po/POTFILES new/libzypp-3.15.0/po/POTFILES
--- old/libzypp-3.15.0/po/POTFILES      2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/po/POTFILES      1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
-     .././zypp/CountryCode.cc \
-     .././zypp/LanguageCode.cc \
-     .././zypp/SourceManager.cc \
-     .././zypp/SourceManager.h \
-     .././zypp/ZYppFactory.cc \
-     .././zypp/base/Exception.cc \
-     .././zypp/media/Mount.cc \
-     .././zypp/solver/detail/ProblemSolutionIgnore.cc \
-     .././zypp/solver/detail/ProblemSolutionInstall.cc \
-     .././zypp/solver/detail/ProblemSolutionKeep.cc \
-     .././zypp/solver/detail/ProblemSolutionUninstall.cc \
-     .././zypp/solver/detail/ProblemSolutionUnlock.cc \
-     .././zypp/solver/detail/QueueItemRequire.cc \
-     .././zypp/solver/detail/ResolverInfo.cc \
-     .././zypp/solver/detail/ResolverInfoChildOf.cc \
-     .././zypp/solver/detail/ResolverInfoConflictsWith.cc \
-     .././zypp/solver/detail/ResolverInfoDependsOn.cc \
-     .././zypp/solver/detail/ResolverInfoMisc.cc \
-     .././zypp/solver/detail/ResolverInfoMissingReq.cc \
-     .././zypp/solver/detail/ResolverInfoNeededBy.cc \
-     .././zypp/solver/detail/ResolverInfoObsoletes.cc \
-     .././zypp/solver/detail/Resolver_problems.cc \
-     .././zypp/source/SourceImpl.cc \
-     .././zypp/source/susetags/SuseTagsImpl.cc \
-     .././zypp/source/yum/YUMScriptImpl.cc \
-     .././zypp/source/yum/YUMSourceImpl.cc \
-     .././zypp/target/TargetImpl.cc \
-     .././zypp/target/rpm/RpmDb.cc \
-     .././zypp/target/store/XMLFilesBackend.cc
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/libzypp-3.15.0/zypp/base/String.h new/libzypp-3.15.0/zypp/base/String.h
--- old/libzypp-3.15.0/zypp/base/String.h       2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/base/String.h       2007-08-16 17:26:57.000000000 +0200
@@ -319,7 +319,7 @@
     std::string getline( std::istream & str, const Trim trim_r );
 
     inline bool startsWith(const std::string& s, const char* str) { return s.find(str) == 0; }
-    inline bool endsWith(const std::string& s, const char* str) { return s.find(str) == s.size() - strlen(str)-1; }
+    inline bool endsWith(const std::string& s, const char* str) { return s.find(str) == s.size() - strlen(str); }
     inline bool contains(const std::string& s, const char* str) { return s.find(str) != std::string::npos; }
 
     /**
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/libzypp-3.15.0/zypp/cache/CacheInitializer.cc new/libzypp-3.15.0/zypp/cache/CacheInitializer.cc
--- old/libzypp-3.15.0/zypp/cache/CacheInitializer.cc   2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/cache/CacheInitializer.cc   2007-08-16 17:26:57.000000000 +0200
@@ -52,6 +52,7 @@
   {
      assert_dir( _pimpl->root );
     _pimpl->con.reset( new sqlite3_connection( ( _pimpl->root + db_file).asString().c_str()) );
+    _pimpl->con->executenonquery("pragma synchronous = 0;");
     _pimpl->con->executenonquery("begin;");
     if( ! tablesCreated() )
     {
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/libzypp-3.15.0/zypp/cache/CacheInitializer.h new/libzypp-3.15.0/zypp/cache/CacheInitializer.h
--- old/libzypp-3.15.0/zypp/cache/CacheInitializer.h    2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/cache/CacheInitializer.h    2007-08-16 17:26:57.000000000 +0200
@@ -19,7 +19,7 @@
 #include "zypp/Pathname.h"
 #include "zypp/cache/sqlite3x/sqlite3x.hpp"
 
-#define ZYPP_CACHE_SCHEMA_VERSION 1003
+#define ZYPP_CACHE_SCHEMA_VERSION 1004
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
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/libzypp-3.15.0/zypp/cache/CacheStore.cc new/libzypp-3.15.0/zypp/cache/CacheStore.cc
--- old/libzypp-3.15.0/zypp/cache/CacheStore.cc 2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/cache/CacheStore.cc 2007-08-16 17:26:56.000000000 +0200
@@ -141,6 +141,7 @@
 
 
     // disable autocommit
+    con.executenonquery("PRAGMA synchronous = 0;");
     con.executenonquery("BEGIN;");
   }
 
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/libzypp-3.15.0/zypp/cache/schema/schema.sql new/libzypp-3.15.0/zypp/cache/schema/schema.sql
--- old/libzypp-3.15.0/zypp/cache/schema/schema.sql     2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/cache/schema/schema.sql     2007-08-16 17:26:57.000000000 +0200
@@ -10,20 +10,25 @@
 DROP TABLE IF EXISTS text_attributes;
 DROP TABLE IF EXISTS split_capabilities;
 DROP TABLE IF EXISTS resolvables_repositories;
+DROP INDEX IF EXISTS resolvables_repository_id_index;
+DROP INDEX IF EXISTS resolvables_shared_id_index;
 DROP TABLE IF EXISTS resolvables;
 DROP TABLE IF EXISTS patch_packages_baseversions;
 DROP TABLE IF EXISTS patch_packages;
 DROP TABLE IF EXISTS other_capabilities;
 DROP TABLE IF EXISTS numeric_attributes;
 DROP TABLE IF EXISTS names;
+DROP INDEX IF EXISTS names_index;
 DROP TABLE IF EXISTS named_capabilities;
 DROP TABLE IF EXISTS modalias_capabilities;
 DROP TABLE IF EXISTS locks;
 DROP TABLE IF EXISTS hal_capabilities;
 DROP TABLE IF EXISTS files;
 DROP TABLE IF EXISTS file_names;
+DROP INDEX IF EXISTS file_names_index;
 DROP TABLE IF EXISTS file_capabilities;
 DROP TABLE IF EXISTS dir_names;
+DROP INDEX IF EXISTS dir_names_index;
 DROP TABLE IF EXISTS delta_packages;
 DROP TABLE IF EXISTS db_info;
 DROP TABLE IF EXISTS repositories;
@@ -72,6 +77,7 @@
     id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
   , name TEXT UNIQUE
 );
+CREATE INDEX names_index ON names(name);
 
 ------------------------------------------------
 -- File names table and normalized sub tables
@@ -81,11 +87,13 @@
    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
   , name TEXT
 );
+CREATE INDEX file_names_index ON file_names(name);
 
 CREATE TABLE dir_names (
    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
   , name TEXT
 );
+CREATE INDEX dir_names_index ON dir_names(name);
 
 CREATE TABLE files (
    id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL
@@ -135,6 +143,7 @@
   , shared_id INTEGER DEFAULT NULL
 );
 CREATE INDEX resolvable_repository_id ON resolvables(repository_id);
+CREATE INDEX resolvables_shared_id_index ON resolvables(shared_id);
 
 ------------------------------------------------
 -- Do we need those here?
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/libzypp-3.15.0/zypp/parser/susetags/RepoParser.cc new/libzypp-3.15.0/zypp/parser/susetags/RepoParser.cc
--- old/libzypp-3.15.0/zypp/parser/susetags/RepoParser.cc       2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/parser/susetags/RepoParser.cc       2007-08-16 17:26:56.000000000 +0200
@@ -486,6 +486,42 @@
         {
           if ( isPatternFile( it->first ) )
           {
+            // *** see also zypp/repo/susetags/Downloader.cc ***
+
+            // omit unwanted patterns, see https://bugzilla.novell.com/show_bug.cgi?id=298716
+            // expect "<name>.<arch>.pat[.gz]", <name> might contain additional dots
+            // split at dots, take .pat or .pat.gz into account
+
+            // vector of splitted pattern filename elements
+            std::vector<std::string> patparts;
+
+            // this is the offset from the last element of patparts
+            unsigned archoff = 2;
+
+            unsigned count = str::split( it->first, std::back_inserter( patparts ), "." );
+
+            if ( patparts[count-1] == "gz" )
+              archoff++;
+
+            if ( count > archoff )
+            {
+              try                              // might by an invalid architecture
+              {
+                Arch patarch( patparts[count-archoff] );
+                if ( !patarch.compatibleWith( ZConfig::instance().systemArchitecture() ) )
+                {
+                  // discard, if not compatible
+                  MIL << "Discarding pattern " << it->first << endl;
+                  continue;
+                }
+              }
+              catch ( const Exception & excpt )
+              {
+                WAR << "Pattern file name does not contain recognizable architecture: " << it->first << endl;
+                // keep .pat file if it doesn't contain an recognizable arch
+              }
+            }
+
            Pathname inputfile( getOptionalFile( _descrdir / it->first, false /*filename already contains .gz */ ) );
            if ( ! inputfile.empty() )
            {
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/libzypp-3.15.0/zypp/repo/susetags/Downloader.cc new/libzypp-3.15.0/zypp/repo/susetags/Downloader.cc
--- old/libzypp-3.15.0/zypp/repo/susetags/Downloader.cc 2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/repo/susetags/Downloader.cc 2007-08-16 17:26:56.000000000 +0200
@@ -120,6 +120,42 @@
           }
         }
       }
+      else if ( str::endsWith( words[3], ".pat" ) 
+               || str::endsWith( words[3], ".pat.gz" ) )
+      {
+
+        // *** see also zypp/parser/susetags/RepoParser.cc ***
+
+        // omit unwanted patterns, see https://bugzilla.novell.com/show_bug.cgi?id=298716
+        // expect "<name>.<arch>.pat[.gz]", <name> might contain additional dots
+        // split at dots, take .pat or .pat.gz into account
+
+        std::vector<std::string> patparts;
+       unsigned archpos = 2;
+        // expect "<name>.<arch>.pat[.gz]", <name> might contain additional dots
+        unsigned count = str::split( buffer, std::back_inserter(patparts), "." );
+       if ( patparts[count-1] == "gz" )
+           archpos++;
+
+        if ( count > archpos )
+        {
+          try                          // might by an invalid architecture
+          {
+            Arch patarch( patparts[count-archpos] );
+            if ( !patarch.compatibleWith( ZConfig::instance().systemArchitecture() ) )
+            {
+              // discard, if not compatible
+              MIL << "Discarding pattern " << words[3] << endl;
+              continue;
+            }
+          }
+          catch ( const Exception & excpt )
+          {
+            WAR << "Pattern file name does not contain recognizable architecture: " << words[3] << endl;
+            // keep .pat file if it doesn't contain an recognizable arch
+          }
+        }
+      }
       OnMediaLocation location( _path + descr_dir + words[3], 1 );
       location.setChecksum( CheckSum( words[1], words[2] ) );
       this->enqueueDigested(location);
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/libzypp-3.15.0/zypp/RepoManager.h new/libzypp-3.15.0/zypp/RepoManager.h
--- old/libzypp-3.15.0/zypp/RepoManager.h       2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/RepoManager.h       2007-08-16 17:26:56.000000000 +0200
@@ -160,7 +160,7 @@
      */
     bool checkIfToRefreshMetadata( const RepoInfo &info,
                                    const Url &url,
-                                   RawMetadataRefreshPolicy policy );
+                                   RawMetadataRefreshPolicy policy = RefreshIfNeeded);
    /**
     * \short Refresh local raw cache
     *
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/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.cc new/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.cc
--- old/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.cc  2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.cc  2007-08-16 17:26:56.000000000 +0200
@@ -71,6 +71,7 @@
     os << ", Triggered by ";
     os << _conflicting_item;
     if (_actually_an_obsolete) os << ", Obsolete !";
+    if (_explicitly_requested) os << ", Explicit";    
     os << "]";
     return os;
 }
@@ -83,6 +84,7 @@
     , _conflicting_item (item)
     , _soft (soft)
     , _actually_an_obsolete (false)
+    , _explicitly_requested (false)    
 {
     _XDEBUG("QueueItemConflict::QueueItemConflict(" << cap << ", " << item << (soft?", soft":"") << ")");
 }
@@ -150,14 +152,17 @@
     ResolverContext_Ptr context;
     QueueItemList & new_items;
     bool actually_an_obsolete;
+    bool explicitly_requested;
 
-    ConflictProcess (const ResPool & pl, PoolItem_Ref ci, const Capability & cc, ResolverContext_Ptr ct, QueueItemList & ni, bool ao)
+    ConflictProcess (const ResPool & pl, PoolItem_Ref ci, const Capability & cc, ResolverContext_Ptr ct, QueueItemList & ni, bool ao,
+                    bool er)
        : pool (pl)
        , conflict_issuer (ci)
        , conflict_capability (cc)
        , context (ct)
        , new_items (ni)
        , actually_an_obsolete (ao)
+       , explicitly_requested (er)
     { }
 
     bool operator()( const CapAndItem & cai )
@@ -239,6 +244,8 @@
 
            QueueItemUninstall_Ptr uninstall = new QueueItemUninstall (pool, provider, actually_an_obsolete ? QueueItemUninstall::OBSOLETE : QueueItemUninstall::CONFLICT);
            uninstall->setCapability (conflict_capability);
+           if (explicitly_requested)
+               uninstall->setExplicitlyRequested();
 
            if (actually_an_obsolete) {
                uninstall->setDueToObsolete (conflict_issuer);
@@ -335,7 +342,7 @@
        }
     }
 
-    ConflictProcess info (pool(), _conflicting_item, _capability, context, new_items, _actually_an_obsolete);
+    ConflictProcess info (pool(), _conflicting_item, _capability, context, new_items, _actually_an_obsolete, _explicitly_requested);
 
     // world()->foreachProvidingPoolItem (_capability, conflict_process_cb, (void *)&info);
 
@@ -358,6 +365,7 @@
     new_conflict->QueueItem::copy(this);
 
     // _actually_an_obsolete is not being copied !
+    new_conflict->_explicitly_requested      = _explicitly_requested;    
 
     return new_conflict;
 }
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/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.h new/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.h
--- old/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.h   2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/solver/detail/QueueItemConflict.h   2007-08-16 17:26:56.000000000 +0200
@@ -54,6 +54,7 @@
     bool _soft;
 
     bool _actually_an_obsolete;
+    bool _explicitly_requested;    
 
   public:
 
@@ -73,6 +74,7 @@
     bool isSoft (void) const { return _soft; }
     bool actuallyAnObsolete (void) const { return _actually_an_obsolete; }
     void setActuallyAnObsolete (void) { _actually_an_obsolete = true; }
+    void setExplicitlyRequested (void) { _explicitly_requested = true; }    
 
     // ---------------------------------- methods
 
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/libzypp-3.15.0/zypp/solver/detail/QueueItemUninstall.cc new/libzypp-3.15.0/zypp/solver/detail/QueueItemUninstall.cc
--- old/libzypp-3.15.0/zypp/solver/detail/QueueItemUninstall.cc 2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/solver/detail/QueueItemUninstall.cc 2007-08-16 17:26:56.000000000 +0200
@@ -382,7 +382,7 @@
     
     this->logInfo (context);
     
-    context->uninstall (_item, _upgraded_to /*bool*/, _due_to_obsolete, _unlink);
+    context->uninstall (_item, _upgraded_to /*bool*/, _due_to_obsolete, _unlink||_explicitly_requested);
     if (status.staysInstalled()) {
        if (! _explicitly_requested
            && _item.status().isLocked()) {
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/libzypp-3.15.0/zypp/solver/detail/ResolverQueue.cc new/libzypp-3.15.0/zypp/solver/detail/ResolverQueue.cc
--- old/libzypp-3.15.0/zypp/solver/detail/ResolverQueue.cc      2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/solver/detail/ResolverQueue.cc      2007-08-16 17:26:56.000000000 +0200
@@ -163,6 +163,7 @@
 ResolverQueue::addExtraConflict (const Capability & dep)
 {
     QueueItemConflict_Ptr qitem = new QueueItemConflict (_context->pool(), dep, PoolItem_Ref());
+    qitem->setExplicitlyRequested();
     addItem (qitem);
 }
 
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/libzypp-3.15.0/zypp/ZConfig.cc new/libzypp-3.15.0/zypp/ZConfig.cc
--- old/libzypp-3.15.0/zypp/ZConfig.cc  2007-08-15 19:21:44.000000000 +0200
+++ new/libzypp-3.15.0/zypp/ZConfig.cc  2007-08-16 17:26:56.000000000 +0200
@@ -37,7 +37,7 @@
     public:
       Impl()
         : repo_add_probe(false),
-          repo_refresh_delay(0),
+          repo_refresh_delay(10),
           autolock_untrustedvendor(false)
       {
         MIL << "ZConfig singleton created." << endl;



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >