RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 08-May-2012 18:50:48
Branch: rpm-5_4 Handle: 2012050816504701
Modified files: (Branch: rpm-5_4)
rpm CHANGES
rpm/rpmio rpmsql.c rpmsql.h
Log:
- rpmsql: add RPMSQL_FLAGS_CREATE to open sqldb immediately.
Summary:
Revision Changes Path
1.3501.2.288+1 -0 rpm/CHANGES
2.59.2.3 +6 -4 rpm/rpmio/rpmsql.c
2.27.4.3 +1 -3 rpm/rpmio/rpmsql.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.287 -r1.3501.2.288 CHANGES
--- rpm/CHANGES 8 May 2012 07:51:05 -0000 1.3501.2.287
+++ rpm/CHANGES 8 May 2012 16:50:47 -0000 1.3501.2.288
@@ -1,4 +1,5 @@
5.4.9 -> 5.4.10:
+ - jbj: rpmsql: add RPMSQL_FLAGS_CREATE to open sqldb immediately.
- devzero2000: update VENDOR because of the merge
in main branch of the
no-owner-group-on-srpm-install feature
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.c
============================================================================
$ cvs diff -u -r2.59.2.2 -r2.59.2.3 rpmsql.c
--- rpm/rpmio/rpmsql.c 7 May 2012 14:38:23 -0000 2.59.2.2
+++ rpm/rpmio/rpmsql.c 8 May 2012 16:50:48 -0000 2.59.2.3
@@ -5073,6 +5073,8 @@
{ "debug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_ONEDASH|POPT_ARGFLAG_DOC_HIDDEN,
&_rpmsql_debug, -1,
N_("Debug embedded SQL interpreter"), NULL},
+ { "create", '\0',
POPT_BIT_SET|POPT_ARGFLAG_ONEDASH|POPT_ARGFLAG_DOC_HIDDEN, &_sql.flags,
RPMSQL_FLAGS_CREATE,
+ N_("create database if not exists"), NULL},
{ "init", '\0', POPT_ARG_STRING|POPT_ARGFLAG_ONEDASH,
&_sql.zInitFile, 0,
N_("read/process named FILE"), N_("FILE") },
@@ -5080,7 +5082,7 @@
N_("print commands before execution"), NULL },
{ "load", '\0', POPT_BIT_SET|POPT_ARGFLAG_TOGGLE|POPT_ARGFLAG_ONEDASH,
&_sql.flags, RPMSQL_FLAGS_NOLOAD,
- N_("disable extnsion loading (normally enabled)"), NULL },
+ N_("disable extension loading (normally enabled)"), NULL },
{ "header", '\0', POPT_BIT_SET|POPT_ARGFLAG_TOGGLE|POPT_ARGFLAG_ONEDASH,
&_sql.flags, RPMSQL_FLAGS_SHOWHDR,
N_("turn headers on or off"), NULL },
@@ -5298,7 +5300,7 @@
SQLDBG((stderr, "==> %s(%p[%u], 0x%x)\n", __FUNCTION__, av, (unsigned)ac,
flags));
if (av && _rpmsql_debug < 0)
-argvPrint("argv", (ARGV_t)av, NULL);
+argvPrint("av", (ARGV_t)av, NULL);
sql->flags = flags; /* XXX useful? */
@@ -5327,8 +5329,8 @@
/* The 1st argument is the database to open (or :memory: default). */
if (sql->av && sql->av[0]) {
sql->zDbFilename = xstrdup(sql->av[0]); /* XXX strdup? */
- /* If database alread exists, open immediately. */
- if (!Access(sql->zDbFilename, R_OK)) {
+ /* If requested or database already exists, open immediately. */
+ if (F_ISSET(sql, CREATE) || !Access(sql->zDbFilename, R_OK)) {
xx = rpmsqlCmd(sql, "open", db, /* XXX watchout: arg order */
sqlite3_open(sql->zDbFilename, &db));
sql->I = (void *) db;
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmio/rpmsql.h
============================================================================
$ cvs diff -u -r2.27.4.2 -r2.27.4.3 rpmsql.h
--- rpm/rpmio/rpmsql.h 7 May 2012 14:38:23 -0000 2.27.4.2
+++ rpm/rpmio/rpmsql.h 8 May 2012 16:50:48 -0000 2.27.4.3
@@ -45,6 +45,7 @@
RPMSQL_FLAGS_INTERACTIVE = (1 << 0), /* -interactive */
RPMSQL_FLAGS_BAIL = (1 << 1), /* -bail */
RPMSQL_FLAGS_NOLOAD = (1 << 2), /* -[no]load */
+ RPMSQL_FLAGS_CREATE = (1 << 3), /* -[no]create */
RPMSQL_FLAGS_ECHO = (1 << 16), /* -echo */
RPMSQL_FLAGS_SHOWHDR = (1 << 17), /* -[no]header */
@@ -124,9 +125,6 @@
char * b;
size_t nb;
- /* XXX sqldb merging cruft. */
- int transaction;
-
#if defined(__LCLINT__)
/*@refs@*/
int nrefs; /*!< (unused) keep splint happy */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
