Hello community, here is the log from the commit of package libzypp-zmd-backend checked in at Fri Jun 9 23:28:26 CEST 2006. -------- --- libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-06-08 18:32:59.000000000 +0200 +++ libzypp-zmd-backend/libzypp-zmd-backend.changes 2006-06-09 14:37:38.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jun 9 14:36:55 CEST 2006 - kkaempf@suse.de + +- strip line breaks from exception strings (#181039) +- rev 3560 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp-zmd-backend.spec ++++++ --- /var/tmp/diff_new_pack.b4zIYe/_old 2006-06-09 23:28:21.000000000 +0200 +++ /var/tmp/diff_new_pack.b4zIYe/_new 2006-06-09 23:28:21.000000000 +0200 @@ -22,7 +22,7 @@ Obsoletes: zmd-librc-backend Summary: ZMD backend for Package, Patch, Pattern, and Product Management Version: 7.1.1.0 -Release: 55 +Release: 56 Source: zmd-backend-%{version}.tar.bz2 Prefix: /usr @@ -68,6 +68,9 @@ /etc/logrotate.d/zmd-backend %changelog -n libzypp-zmd-backend +* Fri Jun 09 2006 - kkaempf@suse.de +- strip line breaks from exception strings (#181039) +- rev 3560 * Thu Jun 08 2006 - kkaempf@suse.de - log all errors to stderr (#181039) - rev 3555 ++++++ zmd-backend-7.1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.h new/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.h --- old/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.h 2006-05-12 12:13:25.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/dbsource/DbSourceImpl.h 2006-06-08 19:23:08.000000000 +0200 @@ -80,6 +80,9 @@ virtual const bool valid() const { return true; } + virtual std::string type(void) const + { return "ZMD"; } + void attachDatabase( sqlite3 *db ); void attachIdMap (IdMap *idmap); void attachZyppSource( zypp::Source_Ref source ); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/parse-metadata.cc new/zmd-backend-7.1.1.0/src/parse-metadata.cc --- old/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-06-08 18:28:22.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/parse-metadata.cc 2006-06-09 14:29:54.000000000 +0200 @@ -63,7 +63,7 @@ manager->restore("/"); } catch (Exception & excpt_r) { - cerr << "3|Can't restore sources: " << excpt_r.asUserString() << endl; + cerr << "3|Can't restore sources: " << backend::striplinebreaks( excpt_r.asUserString() ) << endl; ZYPP_CAUGHT (excpt_r); ERR << "Couldn't restore sources" << endl; return false; @@ -194,7 +194,7 @@ } catch ( const Exception & excpt_r ) { ZYPP_CAUGHT( excpt_r ); - cerr << "3|" << excpt_r.asUserString() << endl; + cerr << "3|" << backend::striplinebreaks( excpt_r.asUserString() ) << endl; return 1; } @@ -293,7 +293,7 @@ } } catch( const Exception & excpt_r ) { - cerr << "3|Can't add repository at " << uri << ": " << excpt_r.asUserString() << endl; + cerr << "3|Can't add repository at " << uri << ": " << backend::striplinebreaks( excpt_r.asUserString() ) << endl; ZYPP_CAUGHT( excpt_r ); ERR << "Can't add repository at " << uri << endl; result = 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/query-files.cc new/zmd-backend-7.1.1.0/src/query-files.cc --- old/zmd-backend-7.1.1.0/src/query-files.cc 2006-05-16 11:34:06.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/query-files.cc 2006-06-09 14:28:56.000000000 +0200 @@ -363,6 +363,7 @@ manager->restore("/"); } catch (Exception & excpt_r) { + cerr << "3|Can't restore sources: " << backend::striplinebreaks( excpt_r.asUserString() ) << endl; ZYPP_CAUGHT (excpt_r); ERR << "Couldn't restore sources" << endl; return; @@ -390,7 +391,7 @@ main (int argc, char **argv) { if (argc < 3 || argc > 4) { - std::cerr << "usage: " << argv[0] << " <database> <uri> [catalog id]" << endl; + std::cerr << "3|usage: " << argv[0] << " <database> <uri> [catalog id]" << endl; return 1; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/service-delete.cc new/zmd-backend-7.1.1.0/src/service-delete.cc --- old/zmd-backend-7.1.1.0/src/service-delete.cc 2006-06-08 16:14:37.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/service-delete.cc 2006-06-09 14:29:07.000000000 +0200 @@ -35,6 +35,7 @@ manager->restore( "/" ); } catch (Exception & excpt_r) { + cerr << "3|Can't restore sources: " << backend::striplinebreaks( excpt_r.asUserString() ) << endl; ZYPP_CAUGHT( excpt_r ); ERR << "Couldn't restore sources" << endl; return 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/transact.cc new/zmd-backend-7.1.1.0/src/transact.cc --- old/zmd-backend-7.1.1.0/src/transact.cc 2006-05-12 12:13:26.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/transact.cc 2006-06-09 14:30:15.000000000 +0200 @@ -203,14 +203,14 @@ cerr << "Need media " << med_callback.mediaNr() << ": " << med_callback.description() << endl; } else { - cout << "3|" << expt_r.asUserString() << endl; + cout << "3|" << backend::striplinebreaks( expt_r.asUserString() ) << endl; cerr << expt_r.asString() << endl; } } catch ( const Exception & expt_r ) { ZYPP_CAUGHT( expt_r ); result = 1; - cout << "3|" << expt_r.asUserString() << endl; + cout << "3|" << backend::striplinebreaks( expt_r.asUserString() ) << endl; cerr << expt_r.asString() << endl; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/zmd-backend.cc new/zmd-backend-7.1.1.0/src/zmd-backend.cc --- old/zmd-backend-7.1.1.0/src/zmd-backend.cc 2006-06-08 16:16:10.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/zmd-backend.cc 2006-06-09 14:29:32.000000000 +0200 @@ -41,13 +41,28 @@ } catch (Exception & excpt_r) { ZYPP_CAUGHT (excpt_r); - cout << "3|" << excpt_r.asUserString() << endl; + cout << "3|" << backend::striplinebreaks( excpt_r.asUserString() ) << endl; cerr << excpt_r.asString() << endl; exit(1); } return T; } + +std::string +striplinebreaks( const std::string & s ) +{ + std::string result = s; + do { + string::size_type nlpos = result.find( "\n" ); + if (nlpos == string::npos) break; + result = result.erase( nlpos, 1 ); + } + while( 1 ); + return result; +} + + }; // EOF diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/src/zmd-backend.h new/zmd-backend-7.1.1.0/src/zmd-backend.h --- old/zmd-backend-7.1.1.0/src/zmd-backend.h 2006-06-08 16:16:10.000000000 +0200 +++ new/zmd-backend-7.1.1.0/src/zmd-backend.h 2006-06-09 13:46:19.000000000 +0200 @@ -17,6 +17,9 @@ // init Target (root="/", commit_only=true), exit(1) on error zypp::Target_Ptr initTarget( zypp::ZYpp::Ptr Z, bool commit_only = true ); +// remove line breaks +std::string striplinebreaks( const std::string & s ); + } #endif // ZMD_BACKEND_H diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/testsuite/tests/Makefile.am new/zmd-backend-7.1.1.0/testsuite/tests/Makefile.am --- old/zmd-backend-7.1.1.0/testsuite/tests/Makefile.am 2006-05-12 12:13:26.000000000 +0200 +++ new/zmd-backend-7.1.1.0/testsuite/tests/Makefile.am 2006-06-09 14:25:30.000000000 +0200 @@ -3,7 +3,8 @@ noinst_PROGRAMS = \ catalogs \ - sources + sources \ + linebreaks ## ################################################## @@ -19,4 +20,4 @@ sources_SOURCES = sources.cc - +linebreaks_SOURCES = linebreaks.cc ../../src/zmd-backend.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/testsuite/tests/Makefile.in new/zmd-backend-7.1.1.0/testsuite/tests/Makefile.in --- old/zmd-backend-7.1.1.0/testsuite/tests/Makefile.in 2006-05-30 12:12:37.000000000 +0200 +++ new/zmd-backend-7.1.1.0/testsuite/tests/Makefile.in 2006-06-09 14:25:34.000000000 +0200 @@ -37,7 +37,8 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -noinst_PROGRAMS = catalogs$(EXEEXT) sources$(EXEEXT) +noinst_PROGRAMS = catalogs$(EXEEXT) sources$(EXEEXT) \ + linebreaks$(EXEEXT) subdir = testsuite/tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -54,6 +55,11 @@ am__DEPENDENCIES_1 = catalogs_DEPENDENCIES = $(top_srcdir)/src/dbsource/lib@PACKAGE@.la \ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) +am_linebreaks_OBJECTS = linebreaks.$(OBJEXT) zmd-backend.$(OBJEXT) +linebreaks_OBJECTS = $(am_linebreaks_OBJECTS) +linebreaks_LDADD = $(LDADD) +linebreaks_DEPENDENCIES = $(top_srcdir)/src/dbsource/lib@PACKAGE@.la \ + $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) am_sources_OBJECTS = sources.$(OBJEXT) sources_OBJECTS = $(am_sources_OBJECTS) sources_LDADD = $(LDADD) @@ -70,8 +76,9 @@ CXXLD = $(CXX) CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -SOURCES = $(catalogs_SOURCES) $(sources_SOURCES) -DIST_SOURCES = $(catalogs_SOURCES) $(sources_SOURCES) +SOURCES = $(catalogs_SOURCES) $(linebreaks_SOURCES) $(sources_SOURCES) +DIST_SOURCES = $(catalogs_SOURCES) $(linebreaks_SOURCES) \ + $(sources_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -224,6 +231,7 @@ catalogs_SOURCES = catalogs.cc sources_SOURCES = sources.cc +linebreaks_SOURCES = linebreaks.cc ../../src/zmd-backend.cc all: all-am .SUFFIXES: @@ -267,6 +275,9 @@ catalogs$(EXEEXT): $(catalogs_OBJECTS) $(catalogs_DEPENDENCIES) @rm -f catalogs$(EXEEXT) $(CXXLINK) $(catalogs_LDFLAGS) $(catalogs_OBJECTS) $(catalogs_LDADD) $(LIBS) +linebreaks$(EXEEXT): $(linebreaks_OBJECTS) $(linebreaks_DEPENDENCIES) + @rm -f linebreaks$(EXEEXT) + $(CXXLINK) $(linebreaks_LDFLAGS) $(linebreaks_OBJECTS) $(linebreaks_LDADD) $(LIBS) sources$(EXEEXT): $(sources_OBJECTS) $(sources_DEPENDENCIES) @rm -f sources$(EXEEXT) $(CXXLINK) $(sources_LDFLAGS) $(sources_OBJECTS) $(sources_LDADD) $(LIBS) @@ -278,7 +289,9 @@ -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catalogs.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linebreaks.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sources.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zmd-backend.Po@am__quote@ .cc.o: @am__fastdepCXX_TRUE@ if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \ @@ -301,6 +314,20 @@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(LTCXXCOMPILE) -c -o $@ $< +zmd-backend.o: ../../src/zmd-backend.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zmd-backend.o -MD -MP -MF "$(DEPDIR)/zmd-backend.Tpo" -c -o zmd-backend.o `test -f '../../src/zmd-backend.cc' || echo '$(srcdir)/'`../../src/zmd-backend.cc; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/zmd-backend.Tpo" "$(DEPDIR)/zmd-backend.Po"; else rm -f "$(DEPDIR)/zmd-backend.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../../src/zmd-backend.cc' object='zmd-backend.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zmd-backend.o `test -f '../../src/zmd-backend.cc' || echo '$(srcdir)/'`../../src/zmd-backend.cc + +zmd-backend.obj: ../../src/zmd-backend.cc +@am__fastdepCXX_TRUE@ if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT zmd-backend.obj -MD -MP -MF "$(DEPDIR)/zmd-backend.Tpo" -c -o zmd-backend.obj `if test -f '../../src/zmd-backend.cc'; then $(CYGPATH_W) '../../src/zmd-backend.cc'; else $(CYGPATH_W) '$(srcdir)/../../src/zmd-backend.cc'; fi`; \ +@am__fastdepCXX_TRUE@ then mv -f "$(DEPDIR)/zmd-backend.Tpo" "$(DEPDIR)/zmd-backend.Po"; else rm -f "$(DEPDIR)/zmd-backend.Tpo"; exit 1; fi +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ source='../../src/zmd-backend.cc' object='zmd-backend.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o zmd-backend.obj `if test -f '../../src/zmd-backend.cc'; then $(CYGPATH_W) '../../src/zmd-backend.cc'; else $(CYGPATH_W) '$(srcdir)/../../src/zmd-backend.cc'; fi` + mostlyclean-libtool: -rm -f *.lo diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/testsuite/tests/linebreaks.cc new/zmd-backend-7.1.1.0/testsuite/tests/linebreaks.cc --- old/zmd-backend-7.1.1.0/testsuite/tests/linebreaks.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1.0/testsuite/tests/linebreaks.cc 2006-06-09 13:58:31.000000000 +0200 @@ -0,0 +1,28 @@ +// +// linebreaks.cc +// +// test striplinebreaks +// + +#include <iostream> +#include <string> +#include "src/zmd-backend.h" + + +using std::endl; +using namespace backend; + +int +main(int argc, char *argv[]) +{ + if (striplinebreaks("") != "") return 1; + if (striplinebreaks("\n") != "") return 2; + if (striplinebreaks("foo\n") != "foo") return 3; + if (striplinebreaks("\nfoo") != "foo") return 4; + if (striplinebreaks("\nfoo\n") != "foo") return 5; + if (striplinebreaks("foo\nbar") != "foobar") return 6; + if (striplinebreaks("foo\n\nbar") != "foobar") return 7; + if (striplinebreaks("foo\n\n\nbar") != "foobar") return 8; + + return 0; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zmd-backend-7.1.1.0/testsuite/zmd.test/linebreaks.exp new/zmd-backend-7.1.1.0/testsuite/zmd.test/linebreaks.exp --- old/zmd-backend-7.1.1.0/testsuite/zmd.test/linebreaks.exp 1970-01-01 01:00:00.000000000 +0100 +++ new/zmd-backend-7.1.1.0/testsuite/zmd.test/linebreaks.exp 2006-06-09 14:35:08.000000000 +0200 @@ -0,0 +1,4 @@ +# linebreaks.exp +# run tests for linebreaks + + shouldPass "linebreaks" ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit-unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit-help@opensuse.org