Hello community, here is the log from the commit of package libzypp checked in at Fri Sep 21 15:51:25 CEST 2007. -------- --- libzypp/libzypp.changes 2007-09-20 15:38:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2007-09-21 11:16:23.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 20 17:37:30 CEST 2007 - jkupec@suse.cz + +- don't probe the repository type upon saving if disabled (#326769) +- version 3.24.6 +- revision 7319 + +------------------------------------------------------------------- Old: ---- libzypp-3.24.5.tar.bz2 New: ---- libzypp-3.24.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.Dk1403/_old 2007-09-21 15:49:40.000000000 +0200 +++ /var/tmp/diff_new_pack.Dk1403/_new 2007-09-21 15:49:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libzypp (Version 3.24.5) +# spec file for package libzypp (Version 3.24.6) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build AutoReqProv: on Summary: Package, Patch, Pattern, and Product Management -Version: 3.24.5 +Version: 3.24.6 Release: 1 -Source: libzypp-3.24.5.tar.bz2 +Source: libzypp-3.24.6.tar.bz2 Source1: libzypp-rpmlintrc Prefix: /usr Provides: yast2-packagemanager @@ -44,7 +44,7 @@ Ladislav Slezak <lslezak@suse.cz> %package devel -Requires: libzypp == 3.24.5 +Requires: libzypp == 3.24.6 Requires: libxml2-devel curl-devel openssl-devel rpm-devel glibc-devel zlib-devel Requires: bzip2 popt-devel dbus-1-devel glib2-devel hal-devel boost-devel libstdc++-devel Requires: cmake @@ -128,6 +128,10 @@ %{prefix}/share/cmake/Modules/FindZypp.cmake %{_libdir}/pkgconfig/libzypp.pc %changelog +* Thu Sep 20 2007 - jkupec@suse.cz +- don't probe the repository type upon saving if disabled (#326769) +- version 3.24.6 +- revision 7319 * Thu Sep 20 2007 - ma@suse.de - Avoid calling rpm repeatedly in case of an error. This is fault-prone, esp. if the error occurred executing the packages post-install script. ++++++ libzypp-3.24.5.tar.bz2 -> libzypp-3.24.6.tar.bz2 ++++++ ++++ 4509 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.24.5/devel/genclass new/libzypp-3.24.6/devel/genclass --- old/libzypp-3.24.5/devel/genclass 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/devel/genclass 2007-09-21 11:16:14.000000000 +0200 @@ -0,0 +1,229 @@ +#! /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.24.5/examples/Makefile new/libzypp-3.24.6/examples/Makefile --- old/libzypp-3.24.5/examples/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/examples/Makefile 2007-09-21 11:16:15.000000000 +0200 @@ -0,0 +1,515 @@ +# 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.24.5/package/libzypp.changes new/libzypp-3.24.6/package/libzypp.changes --- old/libzypp-3.24.5/package/libzypp.changes 2007-09-20 15:38:02.000000000 +0200 +++ new/libzypp-3.24.6/package/libzypp.changes 2007-09-21 11:16:15.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 20 17:37:30 CEST 2007 - jkupec@suse.cz + +- don't probe the repository type upon saving if disabled (#326769) +- version 3.24.6 +- revision 7319 + +------------------------------------------------------------------- Thu Sep 20 15:19:53 CEST 2007 - ma@suse.de - Avoid calling rpm repeatedly in case of an error. This is fault-prone, 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.24.5/po/POTFILES new/libzypp-3.24.6/po/POTFILES --- old/libzypp-3.24.5/po/POTFILES 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/po/POTFILES 2007-09-21 11:16:11.000000000 +0200 @@ -0,0 +1,29 @@ + .././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.24.5/VERSION.cmake new/libzypp-3.24.6/VERSION.cmake --- old/libzypp-3.24.5/VERSION.cmake 2007-09-20 15:38:02.000000000 +0200 +++ new/libzypp-3.24.6/VERSION.cmake 2007-09-21 11:16:15.000000000 +0200 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "3") SET(LIBZYPP_MINOR "24") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") 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.24.5/zypp/RepoManager.cc new/libzypp-3.24.6/zypp/RepoManager.cc --- old/libzypp-3.24.5/zypp/RepoManager.cc 2007-09-20 15:38:03.000000000 +0200 +++ new/libzypp-3.24.6/zypp/RepoManager.cc 2007-09-21 11:16:12.000000000 +0200 @@ -923,10 +923,13 @@ } RepoInfo tosave = info; - + // check the first url for now - if ( ZConfig::instance().repo_add_probe() || ( tosave.type() == RepoType::NONE ) ) + if ( ZConfig::instance().repo_add_probe() + || ( tosave.type() == RepoType::NONE && tosave.enabled()) ) { + DBG << "unknown repository type, probing" << endl; + RepoType probedtype; probedtype = probe(*tosave.baseUrlsBegin()); if ( tosave.baseUrlsSize() > 0 ) @@ -937,7 +940,7 @@ tosave.setType(probedtype); } } - + progress.set(50); // assert the directory exists 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.24.5/zypp-#307105.diff new/libzypp-3.24.6/zypp-#307105.diff --- old/libzypp-3.24.5/zypp-#307105.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/zypp-#307105.diff 2007-09-21 11:16:15.000000000 +0200 @@ -0,0 +1,24 @@ +Index: zypp/repo/yum/Downloader.cc +=================================================================== +--- zypp/repo/yum/Downloader.cc (revision 7259) ++++ zypp/repo/yum/Downloader.cc (working copy) +@@ -57,12 +57,19 @@ + { + MIL << dtype << " : " << loc << endl; + ++ //! \todo do this through a ZConfig call so that it is always in sync with parser + // skip other + if ( dtype == ResourceType::OTHER ) + { + MIL << "Skipping other.xml" << endl; + return true; + } ++ // skip filelists ++ if ( dtype == ResourceType::FILELISTS ) ++ { ++ MIL << "Skipping filelists.xml.gz" << endl; ++ return true; ++ } + + this->enqueueDigested(loc); + 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.24.5/zypp-#326769.diff new/libzypp-3.24.6/zypp-#326769.diff --- old/libzypp-3.24.5/zypp-#326769.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/zypp-#326769.diff 2007-09-21 11:16:15.000000000 +0200 @@ -0,0 +1,29 @@ +Index: zypp/RepoManager.cc +=================================================================== +--- zypp/RepoManager.cc (revision 7316) ++++ zypp/RepoManager.cc (working copy) +@@ -923,10 +923,13 @@ + } + + RepoInfo tosave = info; +- ++ + // check the first url for now +- if ( ZConfig::instance().repo_add_probe() || ( tosave.type() == RepoType::NONE ) ) ++ if ( ZConfig::instance().repo_add_probe() ++ || ( tosave.type() == RepoType::NONE && tosave.enabled()) ) + { ++ DBG << "unknown repository type, probing" << endl; ++ + RepoType probedtype; + probedtype = probe(*tosave.baseUrlsBegin()); + if ( tosave.baseUrlsSize() > 0 ) +@@ -937,7 +940,7 @@ + tosave.setType(probedtype); + } + } +- ++ + progress.set(50); + + // assert the directory exists 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.24.5/zypp-r7259.diff new/libzypp-3.24.6/zypp-r7259.diff --- old/libzypp-3.24.5/zypp-r7259.diff 1970-01-01 01:00:00.000000000 +0100 +++ new/libzypp-3.24.6/zypp-r7259.diff 2007-09-21 11:16:15.000000000 +0200 @@ -0,0 +1,37 @@ +Index: zypp/RepoManager.h +=================================================================== +--- zypp/RepoManager.h (revision 7259) ++++ zypp/RepoManager.h (working copy) +@@ -312,6 +312,8 @@ + /** + * \short Modify repository attributes + * ++ * \throws RepoAlreadyExistsException if the alias specified in newinfo ++ * is already used by another repository + * \throws RepoNotFoundException If no repo match + * \throws ParseException If the file parsing fails + * \throws Exception On other errors. +Index: zypp/RepoManager.cc +=================================================================== +--- zypp/RepoManager.cc (revision 7259) ++++ zypp/RepoManager.cc (working copy) +@@ -1099,6 +1099,19 @@ + { + RepoInfo toedit = getRepositoryInfo(alias); + ++ // check if the new alias already exists when renaming the repo ++ if (alias != newinfo.alias()) ++ { ++ std::list<RepoInfo> repos = knownRepositories(); ++ for ( std::list<RepoInfo>::const_iterator it = repos.begin(); ++ it != repos.end(); ++ ++it ) ++ { ++ if ( newinfo.alias() == (*it).alias() ) ++ ZYPP_THROW(RepoAlreadyExistsException(newinfo.alias())); ++ } ++ } ++ + if (toedit.filepath().empty()) + { + ZYPP_THROW(RepoException("Can't figure where the repo is stored")); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org