Hello community,
here is the log from the commit of package libzypp
checked in at Wed Mar 12 19:51:44 CET 2008.
--------
--- libzypp/libzypp.changes 2008-03-12 14:38:00.000000000 +0100
+++ /mounts/work_src_done/STABLE/libzypp/libzypp.changes 2008-03-12 16:01:33.524291000 +0100
@@ -1,0 +2,9 @@
+Wed Mar 12 15:55:14 CET 2008 - jkupec@suse.cz
+
+- media backend release() methods changed to take string & instead
+ of bool (needed for FATE #120298)
+- media label, detected device list and current device arguments
+ added to the requestMedia callback
+- version 4.4.0
+
+-------------------------------------------------------------------
@@ -5 +13,0 @@
-- version 4.4.0
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libzypp.spec ++++++
--- /var/tmp/diff_new_pack.h32124/_old 2008-03-12 19:50:53.000000000 +0100
+++ /var/tmp/diff_new_pack.h32124/_new 2008-03-12 19:50:53.000000000 +0100
@@ -18,7 +18,7 @@
AutoReqProv: on
Summary: Package, Patch, Pattern, and Product Management
Version: 4.4.0
-Release: 1
+Release: 2
Source: libzypp-4.4.0.tar.bz2
Source1: libzypp-rpmlintrc
Prefix: /usr
@@ -146,9 +146,14 @@
%{_libdir}/pkgconfig/libzypp.pc
%changelog
+* Wed Mar 12 2008 jkupec@suse.cz
+- media backend release() methods changed to take string & instead
+ of bool (needed for FATE #120298)
+- media label, detected device list and current device arguments
+ added to the requestMedia callback
+- version 4.4.0
* Wed Mar 12 2008 coolo@suse.de
- fix for bnc#369543
-- version 4.4.0
* Mon Mar 10 2008 jkupec@suse.cz
- provide download rate info (average and curent) in the
media::DownloadProgressReport for ftp/http (bnc #168935)
++++++ libzypp-4.4.0.tar.bz2 ++++++
++++ 5067 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-4.4.0/createFromMetadata-impl.diff new/libzypp-4.4.0/createFromMetadata-impl.diff
--- old/libzypp-4.4.0/createFromMetadata-impl.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/createFromMetadata-impl.diff 2008-03-12 15:59:53.000000000 +0100
@@ -0,0 +1,98 @@
+Index: zypp/repo/memory/RepoImpl.h
+===================================================================
+--- zypp/repo/memory/RepoImpl.h (revision 8215)
++++ zypp/repo/memory/RepoImpl.h (working copy)
+@@ -7,8 +7,8 @@
+ | |
+ \---------------------------------------------------------------------*/
+
+-#ifndef ZYPP_RepoImpl_H
+-#define ZYPP_RepoImpl_H
++#ifndef ZYPP_REPO_MEMORY_REPOIMPL_H
++#define ZYPP_REPO_MEMORY_REPOIMPL_H
+
+ #include <iosfwd>
+ #include <map>
+@@ -58,13 +58,10 @@
+ } // namespace memory
+ ///////////////////////////////////////////////////////////////////
+
+- using memory::RepoImpl;
+-
+ /////////////////////////////////////////////////////////////////
+ } // namespace source
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////
+ } // namespace zypp
+ ///////////////////////////////////////////////////////////////////
+-#endif
+-
++#endif /* ZYPP_REPO_MEMORY_REPOIMPL_H */
+Index: zypp/repo/cached/RepoImpl.h
+===================================================================
+--- zypp/repo/cached/RepoImpl.h (revision 8215)
++++ zypp/repo/cached/RepoImpl.h (working copy)
+@@ -7,8 +7,8 @@
+ | |
+ \---------------------------------------------------------------------*/
+
+-#ifndef ZYPP_RepoImpl_H
+-#define ZYPP_RepoImpl_H
++#ifndef ZYPP_REPO_CACHED_REPOIMPL_H
++#define ZYPP_REPO_CACHED_REPOIMPL_H
+
+ #include <iosfwd>
+ #include <map>
+@@ -92,13 +92,10 @@
+ } // namespace cached
+ ///////////////////////////////////////////////////////////////////
+
+- using cached::RepoImpl;
+-
+ /////////////////////////////////////////////////////////////////
+ } // namespace source
+ ///////////////////////////////////////////////////////////////////
+ /////////////////////////////////////////////////////////////////
+ } // namespace zypp
+ ///////////////////////////////////////////////////////////////////
+-#endif // ZYPP_SOURCE_PLAINDIR_PLAINDIRIMPL_H
+-
++#endif // ZYPP_REPO_CACHED_REPOIMPL_H
+Index: zypp/RepoManager.cc
+===================================================================
+--- zypp/RepoManager.cc (revision 8215)
++++ zypp/RepoManager.cc (working copy)
+@@ -27,6 +27,7 @@
+
+ #include "zypp/cache/CacheStore.h"
+ #include "zypp/repo/cached/RepoImpl.h"
++#include "zypp/repo/memory/RepoImpl.h"
+ #include "zypp/media/MediaManager.h"
+ #include "zypp/MediaSetAccess.h"
+
+@@ -855,6 +856,25 @@
+ return Repository(repoimpl);
+ }
+
++ Repository RepoManager::createFromMetadata( const RepoInfo &info,
++ const ProgressData::ReceiverFnc & progressrcv )
++ {
++ callback::SendReport<ProgressReport> report;
++ ProgressData progress;
++ progress.sendTo(ProgressReportAdaptor( progressrcv, report ));
++// progress.sendTo( progressrcv );
++ progress.name(str::form(_("Parsing metadata from repository '%s'"), info.name().c_str()));
++
++// CombinedProgressData subprogrcv(progress);
++
++ repo::memory::RepoImpl::Ptr repoimpl =
++ new repo::memory::RepoImpl(info);
++
++ repoimpl->resolvables();
++ // read the resolvables from cache
++ return Repository(repoimpl);
++ }
++
+ ////////////////////////////////////////////////////////////////////////////
+
+ /**
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-4.4.0/devel/genclass new/libzypp-4.4.0/devel/genclass
--- old/libzypp-4.4.0/devel/genclass 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/devel/genclass 2008-03-12 15:59:52.000000000 +0100
@@ -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 <$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-4.4.0/examples/Makefile new/libzypp-4.4.0/examples/Makefile
--- old/libzypp-4.4.0/examples/Makefile 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/examples/Makefile 2008-03-12 15:59:53.000000000 +0100
@@ -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-4.4.0/package/libzypp.changes new/libzypp-4.4.0/package/libzypp.changes
--- old/libzypp-4.4.0/package/libzypp.changes 2008-03-12 14:37:49.000000000 +0100
+++ new/libzypp-4.4.0/package/libzypp.changes 2008-03-12 15:59:53.000000000 +0100
@@ -1,8 +1,16 @@
-------------------------------------------------------------------
+Wed Mar 12 15:55:14 CET 2008 - jkupec@suse.cz
+
+- media backend release() methods changed to take string & instead
+ of bool (needed for FATE #120298)
+- media label, detected device list and current device arguments
+ added to the requestMedia callback
+- version 4.4.0
+
+-------------------------------------------------------------------
Wed Mar 12 14:16:07 CET 2008 - coolo@suse.de
- fix for bnc#369543
-- version 4.4.0
-------------------------------------------------------------------
Mon Mar 10 13:30:04 CET 2008 - jkupec@suse.cz
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-4.4.0/plaindir_repo_parse_recursive.diff new/libzypp-4.4.0/plaindir_repo_parse_recursive.diff
--- old/libzypp-4.4.0/plaindir_repo_parse_recursive.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/plaindir_repo_parse_recursive.diff 2008-03-12 15:59:52.000000000 +0100
@@ -0,0 +1,60 @@
+Index: zypp/parser/plaindir/RepoParser.cc
+===================================================================
+--- zypp/parser/plaindir/RepoParser.cc (revision 9056)
++++ zypp/parser/plaindir/RepoParser.cc (working copy)
+@@ -138,7 +138,8 @@
+ {
+ _ticks.sendTo( fnc_r );
+ }
+- int extract_packages_from_directory( const Pathname & path,
++ int extract_packages_from_directory( const Pathname & rootpath,
++ const Pathname & subdir,
+ bool recursive);
+ /** Main entry to parser. */
+ void parse( const Pathname & reporoot_r );
+@@ -161,7 +162,7 @@
+ //
+ void RepoParser::Impl::parse( const Pathname & reporoot_r )
+ {
+- extract_packages_from_directory( reporoot_r, true );
++ extract_packages_from_directory( reporoot_r, Pathname(), true );
+ /*if ( ! _ticks.incr() )
+ ZYPP_THROW( AbortRequestException() );*/
+ // Done
+@@ -169,10 +170,12 @@
+ ZYPP_THROW( AbortRequestException() );
+ }
+
+-int RepoParser::Impl::extract_packages_from_directory( const Pathname & path,
++int RepoParser::Impl::extract_packages_from_directory( const Pathname & rootpath,
++ const Pathname & subdir,
+ bool recursive)
+ {
+ using target::rpm::RpmHeader;
++ Pathname path = rootpath / subdir;
+ Pathname filename;
+ PathInfo magic;
+ bool distro_magic, pkginfo_magic;
+@@ -212,14 +215,16 @@
+ for (std::liststd::string::const_iterator it = dircontent.begin(); it != dircontent.end(); ++it) {
+ Pathname file_path = path + *it;
+ PathInfo file_info( file_path );
+- if (recursive && file_info.isDir()) {
+-
+- extract_packages_from_directory( file_path, recursive );
+-
+- } else if (file_info.isFile() && file_path.extension() == ".rpm" ) {
++ if (recursive && file_info.isDir())
++ {
++ extract_packages_from_directory( rootpath, subdir / *it, recursive );
++ }
++ else if (file_info.isFile() && file_path.extension() == ".rpm" )
++ {
+ RpmHeader::constPtr header = RpmHeader::readPackage( file_path, RpmHeader::NOSIGNATURE );
+ #warning FIX creation of Package from src.rpm header
+- data::Package_Ptr package = makePackageDataFromHeader( header, NULL, *it, _repositoryId );
++ // make up proper location relative to rootpath (bnc #368218)
++ data::Package_Ptr package = makePackageDataFromHeader( header, NULL, subdir / *it, _repositoryId );
+ if (package != NULL) {
+ if (Arch(package->arch).compatibleWith(_sysarch))
+ {
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-4.4.0/po/POTFILES new/libzypp-4.4.0/po/POTFILES
--- old/libzypp-4.4.0/po/POTFILES 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/po/POTFILES 2008-03-12 15:59:52.000000000 +0100
@@ -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-4.4.0/releaseAll.diff new/libzypp-4.4.0/releaseAll.diff
--- old/libzypp-4.4.0/releaseAll.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/releaseAll.diff 2008-03-12 15:59:53.000000000 +0100
@@ -0,0 +1,34 @@
+Index: zypp/MediaSetAccess.cc
+===================================================================
+--- zypp/MediaSetAccess.cc (revision 8299)
++++ zypp/MediaSetAccess.cc (working copy)
+@@ -142,6 +142,9 @@
+ reason = media::MediaChangeReport::WRONG;
+ }
+
++ // release all media before requesting another (#336881)
++ media_mgr.releaseAll();
++
+ user = report->requestMedia (
+ _url,
+ media_nr,
+@@ -249,6 +252,9 @@
+ reason = media::MediaChangeReport::WRONG;
+ }
+
++ // release all media before requesting another (#336881)
++ media_mgr.releaseAll();
++
+ user = checkonly ? media::MediaChangeReport::ABORT :
+ report->requestMedia (
+ _url,
+@@ -381,6 +387,9 @@
+ reason = media::MediaChangeReport::WRONG;
+ }
+
++ // release all media before requesting another (#336881)
++ media_mgr.releaseAll();
++
+ user = report->requestMedia(_url,
+ media_nr,
+ reason,
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-4.4.0/Selectable.h.status-enum.diff new/libzypp-4.4.0/Selectable.h.status-enum.diff
--- old/libzypp-4.4.0/Selectable.h.status-enum.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/Selectable.h.status-enum.diff 2008-03-12 15:59:53.000000000 +0100
@@ -0,0 +1,35 @@
+Index: zypp/ui/Selectable.h
+===================================================================
+--- zypp/ui/Selectable.h (revision 8615)
++++ zypp/ui/Selectable.h (working copy)
+@@ -52,12 +52,29 @@
+ public:
+ typedef intrusive_ptr<Selectable> Ptr;
+ typedef intrusive_ptr<const Selectable> constPtr;
++
++ typedef std::set<Ptr> SelectableSet;
++ typedef std::set<constPtr> constSelectableSet;
+
+ /** Iterates over ResObject::constPtr */
+ typedef SelectableTraits::available_iterator available_iterator;
+ typedef SelectableTraits::availableItem_iterator availablePoolItem_iterator;
+ typedef SelectableTraits::availableItem_size_type size_type;
+-
++/*
++ typedef enum
++ {
++ ST_DONT_INSTALL = 0,
++ ST_INSTALL = 1,
++ ST_KEEP = 1 << 2,
++ ST_UPDATE = 1 << 3,
++ ST_DELETE = 1 << 4,
++ ST_PROTECTED = 1 << 5,
++ ST_TABOO = 1 << 6,
++ ST_AUTO_INSTALL = 1 << 7,
++ ST_AUTO_UPDATE = 1 << 8,
++ ST_AUTO_DELTE = 1 << 9
++ } Status;
++*/
+ public:
+ /** The ResObjects kind. */
+ ResObject::Kind kind() const;
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-4.4.0/tests/media/media2_test.cc new/libzypp-4.4.0/tests/media/media2_test.cc
--- old/libzypp-4.4.0/tests/media/media2_test.cc 2008-03-12 14:37:50.000000000 +0100
+++ new/libzypp-4.4.0/tests/media/media2_test.cc 2008-03-12 15:59:53.000000000 +0100
@@ -102,7 +102,7 @@
try
{
ONE_STEP("ONE: release()")
- mm.release(one, true);
+ mm.release(one); //! \todo add the device argument once mm.getDevices() is ready
}
catch(const MediaException &e)
{
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-4.4.0/tests/media/media3_test.cc new/libzypp-4.4.0/tests/media/media3_test.cc
--- old/libzypp-4.4.0/tests/media/media3_test.cc 2008-03-12 14:37:50.000000000 +0100
+++ new/libzypp-4.4.0/tests/media/media3_test.cc 2008-03-12 15:59:53.000000000 +0100
@@ -114,8 +114,8 @@
{
try
{
- ONE_STEP("SRC: release(eject=true)")
- mm.release(src, true);
+ ONE_STEP("SRC: release(ejectDev=\"/dev/device\")")
+ mm.release(src);//! \todo add the device argument once mm.getDevices() is ready
}
catch(const MediaException &e)
{
Files old/libzypp-4.4.0/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.g and new/libzypp-4.4.0/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.g differ
Files old/libzypp-4.4.0/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.gz and new/libzypp-4.4.0/tests/repo/susetags/data/stable-x86-subset-gz/suse/setup/descr/kde-10.3-71.i586.pat.gz differ
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-4.4.0/zypp/media/MediaException.cc.rej new/libzypp-4.4.0/zypp/media/MediaException.cc.rej
--- old/libzypp-4.4.0/zypp/media/MediaException.cc.rej 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/zypp/media/MediaException.cc.rej 2008-03-12 15:59:52.000000000 +0100
@@ -0,0 +1,293 @@
+***************
+*** 35,105 ****
+
+ std::ostream & MediaUnmountException::dumpOn( std::ostream & str ) const
+ {
+- return str << "Failed to unmount " << _path
+ << " : " << _error << endl;
+ }
+
+ std::ostream & MediaBadFilenameException::dumpOn( std::ostream & str ) const
+ {
+- return str << "Bad file name " << _filename << endl;
+ }
+
+ std::ostream & MediaNotOpenException::dumpOn( std::ostream & str ) const
+ {
+- return str << "Media not opened while performing action " << _action << endl;
+ }
+
+ std::ostream & MediaFileNotFoundException::dumpOn( std::ostream & str) const
+ {
+- return str << "File " << _filename
+- << " not found on media: " << _url << endl;
+ }
+
+ std::ostream & MediaWriteException::dumpOn( std::ostream & str) const
+ {
+- return str << "Cannot write file " << _filename << endl;
+ }
+
+ std::ostream & MediaNotAttachedException::dumpOn( std::ostream & str) const
+ {
+- return str << "Media not attached: " << _url << endl;
+ }
+
+ std::ostream & MediaBadAttachPointException::dumpOn( std::ostream & str) const
+ {
+- return str << "Bad media attach point: " << _url << endl;
+ }
+
+ std::ostream & MediaCurlInitException::dumpOn( std::ostream & str) const
+ {
+- return str << "Curl init failed for: " << _url << endl;
+ }
+
+ std::ostream & MediaSystemException::dumpOn( std::ostream & str) const
+ {
+- return str << "System exception: " << _message
+- << " on media: " << _url << endl;
+ }
+
+ std::ostream & MediaNotAFileException::dumpOn( std::ostream & str) const
+ {
+- return str << "Path " << _path
+- << " on media: " << _url
+- << " is not a file." << endl;
+ }
+
+ std::ostream & MediaNotADirException::dumpOn( std::ostream & str) const
+ {
+- return str << "Path " << _path
+- << " on media: " << _url
+- << " is not a directory." << endl;
+ }
+
+ std::ostream & MediaBadUrlException::dumpOn( std::ostream & str) const
+ {
+ if( _msg.empty())
+ {
+- return str << "Malformed URL: " << _url << endl;
+ }
+ else
+ {
+--- 38,118 ----
+
+ std::ostream & MediaUnmountException::dumpOn( std::ostream & str ) const
+ {
++ return str << form(_("Failed to unmount %s"), _path.c_str())
+ << " : " << _error << endl;
+ }
+
+ std::ostream & MediaBadFilenameException::dumpOn( std::ostream & str ) const
+ {
++ return str << form(_("Bad file name: %s"), _filename.c_str()) << endl;
+ }
+
+ std::ostream & MediaNotOpenException::dumpOn( std::ostream & str ) const
+ {
++ return str << form(
++ _("Medium not opened when trying to perform action '%s'."), _action.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaFileNotFoundException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ _("File '%s' not found on medium '%s'"),
++ _filename.c_str(), _url.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaWriteException::dumpOn( std::ostream & str) const
+ {
++ return str << form(_("Cannot write file '%s'."), _filename.c_str()) << endl;
+ }
+
+ std::ostream & MediaNotAttachedException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Medium not attached") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaBadAttachPointException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Bad media attach point") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaCurlInitException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ // TranslatorExplanation: curl is the name of a library, don't translate
++ _("Download (curl) initialization failed for '%s'"), _url.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaSystemException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ _("System exception '%s' on medium '%s'."),
++ _message.c_str(), _url.c_str()) << endl;
+ }
+
+ std::ostream & MediaNotAFileException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ _("Path '%s' on medium '%s' is not a file."),
++ _path.c_str(), _url.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaNotADirException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ _("Path '%s' on medium '%s' is not a directory."),
++ _path.c_str(), _url.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaBadUrlException::dumpOn( std::ostream & str) const
+ {
+ if( _msg.empty())
+ {
++ return str << _("Malformed URI") << ": " << _url << endl;
+ }
+ else
+ {
+***************
+*** 109,168 ****
+
+ std::ostream & MediaBadUrlEmptyHostException::dumpOn( std::ostream & str) const
+ {
+- return str << "Empty host name in URL: " << _url << endl;
+ }
+
+ std::ostream & MediaBadUrlEmptyFilesystemException::dumpOn( std::ostream & str) const
+ {
+- return str << "Empty filesystem in URL: " << _url << endl;
+ }
+
+ std::ostream & MediaBadUrlEmptyDestinationException::dumpOn( std::ostream & str) const
+ {
+- return str << "Empty destination in URL: " << _url << endl;
+ }
+
+ std::ostream & MediaUnsupportedUrlSchemeException::dumpOn( std::ostream & str) const
+ {
+- return str << "Unsupported URL scheme in URL: " << _url << endl;
+ }
+
+ std::ostream & MediaNotSupportedException::dumpOn( std::ostream & str) const
+ {
+- return str << "Operation not supported by media: " << _url << endl;
+ }
+
+ std::ostream & MediaCurlException::dumpOn( std::ostream & str) const
+ {
+- return str << "Curl error for '" << _url << "':" << endl
+- << "Error code: " << _err << endl
+- << "Error message: " << _msg << endl;
+ }
+
+ std::ostream & MediaCurlSetOptException::dumpOn( std::ostream & str) const
+ {
+- return str << "Error occurred while setting CURL options for " << _url
+- << ": " << _msg << endl;
+ }
+
+ std::ostream & MediaNotDesiredException::dumpOn( std::ostream & str ) const
+ {
+- return str << "Media source " << _url << " does not contain the desired media" << endl;
+ }
+
+ std::ostream & MediaIsSharedException::dumpOn( std::ostream & str ) const
+ {
+- return str << "Media " << _name << " is in use by another instance" << endl;
+ }
+
+ std::ostream & MediaNotEjectedException::dumpOn( std::ostream & str ) const
+ {
+ if( _name.empty())
+- return str << "Can't eject any media" << endl;
+ else
+- return str << "Can't eject media " << _name << endl;
+ }
+
+ /////////////////////////////////////////////////////////////////
+ } // namespace media
+ } // namespace zypp
+--- 122,196 ----
+
+ std::ostream & MediaBadUrlEmptyHostException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Empty host name in URI") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaBadUrlEmptyFilesystemException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Empty filesystem in URI") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaBadUrlEmptyDestinationException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Empty destination in URI") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaUnsupportedUrlSchemeException::dumpOn( std::ostream & str) const
+ {
++ return str << form(_("Unsupported URI scheme in '%s'."), _url.c_str()) << endl;
+ }
+
+ std::ostream & MediaNotSupportedException::dumpOn( std::ostream & str) const
+ {
++ return str << _("Operation not supported by medium") << ": " << _url << endl;
+ }
+
+ std::ostream & MediaCurlException::dumpOn( std::ostream & str) const
+ {
++ // TranslatorExplanation: curl is the name of a library, don't translate
++ return str << form(_(
++ "Download (curl) error for '%s':\n"
++ "Error code: %s\n"
++ "Error message: %s\n"), _url.c_str(), _err.c_str(), _msg.c_str());
+ }
+
+ std::ostream & MediaCurlSetOptException::dumpOn( std::ostream & str) const
+ {
++ return str << form(
++ // TranslatorExplanation: curl is the name of a library, don't translate
++ _("Error occurred while setting download (curl) options for '%s':"),
++ _url.c_str())
++ << endl << _msg << endl;
+ }
+
+ std::ostream & MediaNotDesiredException::dumpOn( std::ostream & str ) const
+ {
++ return str << form(
++ _("Media source '%s' does not contain the desired medium"), _url.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaIsSharedException::dumpOn( std::ostream & str ) const
+ {
++ return str << form(_("Medium '%s' is in use by another instance"), _name.c_str())
++ << endl;
+ }
+
+ std::ostream & MediaNotEjectedException::dumpOn( std::ostream & str ) const
+ {
+ if( _name.empty())
++ return str << _("Can't eject any media") << endl;
+ else
++ return str << form(_("Can't eject media '%s'"), _name.c_str()) << endl;
+ }
+
++ std::ostream & MediaForbiddenException::dumpOn( std::ostream & str ) const
++ {
++ if (_msg.empty())
++ return str << form(_("Permission to access '%s' denied."), _url.c_str()) << endl;
++ return str << _msg << endl;
++ }
++
+ /////////////////////////////////////////////////////////////////
+ } // namespace media
+ } // 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-4.4.0/zypp/media/MediaException.h new/libzypp-4.4.0/zypp/media/MediaException.h
--- old/libzypp-4.4.0/zypp/media/MediaException.h 2008-03-12 14:37:50.000000000 +0100
+++ new/libzypp-4.4.0/zypp/media/MediaException.h 2008-03-12 15:59:52.000000000 +0100
@@ -37,14 +37,13 @@
/** Ctor taking message.
* Use \ref ZYPP_THROW to throw exceptions.
*/
- MediaException() : Exception( "Media Exception" ),
- _devices(std::vectorstd::string()), _dev_current(0)
+ MediaException() : Exception( "Media Exception" ), _dev_current(0)
{}
/** Ctor taking message.
* Use \ref ZYPP_THROW to throw exceptions.
*/
MediaException( const std::string & msg_r )
- : Exception( msg_r ), _devices(std::vectorstd::string()), _dev_current(0)
+ : Exception( msg_r ), _dev_current(0)
{}
/**
@@ -58,17 +57,17 @@
unsigned int devCurrent)
: Exception( msg_r ), _devices(devices), _dev_current(devCurrent)
{}
-
+
const std::vectorstd::string & devices() const { return _devices; }
unsigned int deviceCurrent() const { return _dev_current; }
/** Dtor. */
virtual ~MediaException() throw() {};
- protected:
- void operator = (const MediaException & ex) {}
+// private:
+// void operator = (const MediaException & ex) {}
private:
- const std::vectorstd::string & _devices;
+ std::vectorstd::string _devices;
unsigned int _dev_current;
};
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-4.4.0/zypp/media/MediaManager.cc new/libzypp-4.4.0/zypp/media/MediaManager.cc
--- old/libzypp-4.4.0/zypp/media/MediaManager.cc 2008-03-12 14:37:50.000000000 +0100
+++ new/libzypp-4.4.0/zypp/media/MediaManager.cc 2008-03-12 15:59:52.000000000 +0100
@@ -706,7 +706,7 @@
{
DBG << "Releasing media id " << m->first << std::endl;
m->second.desired = false;
- m->second.handler->release(false);
+ m->second.handler->release();
}
else
{
@@ -1124,7 +1124,7 @@
AttachedMedia ret = m->second.handler->attachedMedia();
if( ret.mediaSource && ret.mediaSource->equals( *media))
{
- m->second.handler->release(false);
+ m->second.handler->release();
m->second.desired = false;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libzypp-4.4.0/zypp/MediaSetAccess.cc new/libzypp-4.4.0/zypp/MediaSetAccess.cc
--- old/libzypp-4.4.0/zypp/MediaSetAccess.cc 2008-03-12 14:37:50.000000000 +0100
+++ new/libzypp-4.4.0/zypp/MediaSetAccess.cc 2008-03-12 15:59:52.000000000 +0100
@@ -120,7 +120,7 @@
DBG << "Media couldn't provide file " << file << " , releasing." << endl;
try
{
- media_mgr.release (media, false);
+ media_mgr.release (media);
}
catch (const Exception & excpt_r)
{
@@ -234,7 +234,7 @@
DBG << "Media couldn't provide file " << file << " , releasing." << endl;
try
{
- media_mgr.release (media, false);
+ media_mgr.release (media);
}
catch (const Exception & excpt_r)
{
@@ -361,7 +361,7 @@
DBG << "Media couldn't provide dir " << dir << ", releasing." << endl;
try
{
- media_mgr.release (_media, false);
+ media_mgr.release (_media);
}
catch (const Exception & excpt_r)
{
@@ -394,7 +394,7 @@
{
reason = media::MediaChangeReport::WRONG;
}
-
+
unsigned int devindex = excp.deviceCurrent();
user = report->requestMedia(_url,
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-4.4.0/zypp-proxy-tr-mode.diff new/libzypp-4.4.0/zypp-proxy-tr-mode.diff
--- old/libzypp-4.4.0/zypp-proxy-tr-mode.diff 1970-01-01 01:00:00.000000000 +0100
+++ new/libzypp-4.4.0/zypp-proxy-tr-mode.diff 2008-03-12 15:59:53.000000000 +0100
@@ -0,0 +1,17 @@
+Index: zypp/media/MediaCurl.cc
+===================================================================
+--- zypp/media/MediaCurl.cc (revision 8027)
++++ zypp/media/MediaCurl.cc (working copy)
+@@ -549,6 +549,12 @@
+ disconnectFrom();
+ ZYPP_THROW(MediaCurlSetOptException(_url, _curlError));
+ }
++
++ ret = curl_easy_setopt( _curl, CURLOPT_PROXY_TRANSFER_MODE, 1 );
++ if ( ret != 0 ) {
++ disconnectFrom();
++ ZYPP_THROW(MediaCurlSetOptException(_url, _curlError));
++ }
+
+ /*---------------------------------------------------------------*
+ CURLOPT_PROXYUSERPWD: [user name]:[password]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org