OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 09-Aug-2008 16:15:58
Branch: HEAD Handle: 2008080915155800
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
remove a now obsolete and now partly broken error handling
Summary:
Revision Changes Path
1.42 +0 -23 openpkg-src/perl-dbi/perl-dbi.patch
1.294 +1 -1 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.41 -r1.42 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 29 Jul 2008 16:35:45 -0000
1.41
+++ openpkg-src/perl-dbi/perl-dbi.patch 9 Aug 2008 14:15:58 -0000
1.42
@@ -61,29 +61,6 @@
'OPTIMIZE' => "-O2",
'DEFINE' => "-DSQLITE_CORE -DSQLITE_ENABLE_FTS2 -DNDEBUG=1
-DSQLITE_PTR_SZ=$Config{ptrsize}" .
( ($Config{d_usleep} ||
-Index: DBD-SQLite-1.14/dbdimp.c
---- DBD-SQLite-1.14/dbdimp.c.orig 2007-08-24 04:51:25 +0200
-+++ DBD-SQLite-1.14/dbdimp.c 2008-02-02 10:57:18 +0100
-@@ -394,15 +394,18 @@
-
- sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
- if (DBIc_NUM_FIELDS(imp_sth) == 0) {
-+ char *defererr = strdup((char*)sqlite3_errmsg(imp_dbh->db));
- while ((imp_sth->retval = sqlite3_step(imp_sth->stmt)) !=
SQLITE_DONE) {
- if (imp_sth->retval == SQLITE_ROW) {
- continue;
- }
- /* There are bug reports that say this should be
sqlite3_reset() */
- sqlite3_finalize(imp_sth->stmt);
-- sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval,
(char*)sqlite3_errmsg(imp_dbh->db));
-+ sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval,
defererr);
-+ free(defererr);
- return -5;
- }
-+ free(defererr);
- /* warn("Finalize\n"); */
- sqlite3_reset(imp_sth->stmt);
- imp_sth->nrow = sqlite3_changes(imp_dbh->db);
Index: DBD-SQLite-1.14/dbdimp.h
--- DBD-SQLite-1.14/dbdimp.h.orig 2007-08-23 02:45:08 +0200
+++ DBD-SQLite-1.14/dbdimp.h 2008-02-02 10:57:18 +0100
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.293 -r1.294 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 4 Aug 2008 17:10:33 -0000
1.293
+++ openpkg-src/perl-dbi/perl-dbi.spec 9 Aug 2008 14:15:58 -0000
1.294
@@ -54,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20080804
+Release: 20080809
# package options
%option with_dbd_sqlite yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
