[prev in list] [next in list] [prev in thread] [next in thread]
List: rpm-cvs
Subject: [CVS] RPM: rpm/ CHANGES rpm/lib/ poptQV.c rpm/scripts/ yum_filelists_s...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-01-25 18:38:02
Message-ID: 20090125183802.8D788216E97 () rpm5 ! org
[Download RAW message or body]
RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 25-Jan-2009 19:38:02
Branch: HEAD Handle: 2009012518380002
Modified files:
rpm CHANGES
rpm/lib poptQV.c
rpm/scripts yum_filelists_sqlite yum_filelists_xml
yum_other_sqlite yum_other_xml yum_primary_sqlite
yum_primary_xml
rpm/tools Makefile.am rpmrepo.c
Log:
- rpmrepo: compile in queryformat strings.
- add doublequotes around queryformats for #include use in rpmrepo.c.
Summary:
Revision Changes Path
1.2759 +2 -0 rpm/CHANGES
2.61 +8 -7 rpm/lib/poptQV.c
1.2 +3 -1 rpm/scripts/yum_filelists_sqlite
1.2 +3 -1 rpm/scripts/yum_filelists_xml
1.2 +3 -1 rpm/scripts/yum_other_sqlite
1.2 +3 -1 rpm/scripts/yum_other_xml
1.2 +3 -1 rpm/scripts/yum_primary_sqlite
1.3 +3 -1 rpm/scripts/yum_primary_xml
2.118 +1 -0 rpm/tools/Makefile.am
2.12 +18 -186 rpm/tools/rpmrepo.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2758 -r1.2759 CHANGES
--- rpm/CHANGES 25 Jan 2009 17:22:17 -0000 1.2758
+++ rpm/CHANGES 25 Jan 2009 18:38:00 -0000 1.2759
@@ -1,5 +1,7 @@
5.2a2 -> 5.2a3:
+ - jbj: rpmrepo: compile in queryformat strings.
+ - jbj: add doublequotes around queryformats for #include use in rpmrepo.c.
- jbj: blueprint/use yum:{primary,filelists,other}.sqlite queryformats.
- jbj: blueprint/use yum:{primary,filelists,other}.xml queryformats.
- jbj: install yum:{primary,filelists,other}.xml queryformats.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.60 -r2.61 poptQV.c
--- rpm/lib/poptQV.c 25 Jan 2009 17:01:59 -0000 2.60
+++ rpm/lib/poptQV.c 25 Jan 2009 18:38:01 -0000 2.61
@@ -311,13 +311,14 @@
goto _qfexit;
if (b == NULL || nb == 0) /* XXX can't happen */
goto _qfexit;
-#ifdef DYING /* XXX don't muck about with queryformats. */
- /* XXX trim trailing newline(s). */
- nb--; /* XXX skip final NUL */
- while (nb > 0 && b[nb-1] == '\n')
- b[--nb] = '\0';
-#endif
- arg = b;
+ /* XXX trim double quotes */
+ if (*b == '"') {
+ while (nb > 0 && b[nb] != '"')
+ b[nb--] = '\0';
+ b[nb] = '\0';
+ arg = b + 1;
+ } else
+ arg = b;
}
/* Append to existing queryformat. */
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_filelists_sqlite
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_filelists_sqlite
--- rpm/scripts/yum_filelists_sqlite 25 Jan 2009 17:22:18 -0000 1.1
+++ rpm/scripts/yum_filelists_sqlite 25 Jan 2009 18:38:01 -0000 1.2
@@ -1,3 +1,4 @@
+"\
INSERT into packages values (\
'%{DBINSTANCE}'\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
@@ -6,4 +7,5 @@
\nINSERT into filelist values (\
%{filessqlentry2}\
);\
-]}|
+]}|\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_filelists_xml
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_filelists_xml
--- rpm/scripts/yum_filelists_xml 25 Jan 2009 16:31:17 -0000 1.1
+++ rpm/scripts/yum_filelists_xml 25 Jan 2009 18:38:01 -0000 1.2
@@ -1,3 +1,4 @@
+"\
<package pkgid=\"%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|\" name=\"%{NAME:cdata}\" \
arch=\"%{ARCH:cdata}\">\ \n <version epoch=\"%|EPOCH?{%{EPOCH}}:{0}|\" \
ver=\"%{VERSION:cdata}\" rel=\"%{RELEASE:cdata}\"/>\ %|filesxmlentry2?{\
@@ -5,4 +6,5 @@
\n %{filesxmlentry2}\
]\
}|\
-\n</package>
+\n</package>\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_other_sqlite
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_other_sqlite
--- rpm/scripts/yum_other_sqlite 25 Jan 2009 17:22:18 -0000 1.1
+++ rpm/scripts/yum_other_sqlite 25 Jan 2009 18:38:01 -0000 1.2
@@ -1,3 +1,4 @@
+"\
INSERT into packages values (\
'%{DBINSTANCE}'\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
@@ -11,4 +12,5 @@
);\
]}:{\
\nINSERT into changelog ('%{DBINSTANCE}', '', '', '');\
-}|
+}|\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_other_xml
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_other_xml
--- rpm/scripts/yum_other_xml 25 Jan 2009 16:31:17 -0000 1.1
+++ rpm/scripts/yum_other_xml 25 Jan 2009 18:38:01 -0000 1.2
@@ -1,3 +1,4 @@
+"\
<package pkgid=\"%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|\" name=\"%{NAME:cdata}\" \
arch=\"%{ARCH:cdata}\">\ \n <version epoch=\"%|EPOCH?{%{EPOCH}}:{0}|\" \
ver=\"%{VERSION:cdata}\" rel=\"%{RELEASE:cdata}\"/>\ %|changelogname?{\
@@ -7,4 +8,5 @@
}:{\
\n <changelog/>\
}|\
-\n</package>
+\n</package>\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_primary_sqlite
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_primary_sqlite
--- rpm/scripts/yum_primary_sqlite 25 Jan 2009 17:22:18 -0000 1.1
+++ rpm/scripts/yum_primary_sqlite 25 Jan 2009 18:38:01 -0000 1.2
@@ -1,3 +1,4 @@
+"\
INSERT into packages values (\
'%{DBINSTANCE}'\
, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
@@ -50,4 +51,5 @@
\nINSERT into files values (\
%{filessqlentry1}\
);\
-]}|
+]}|\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_primary_xml
============================================================================
$ cvs diff -u -r1.2 -r1.3 yum_primary_xml
--- rpm/scripts/yum_primary_xml 25 Jan 2009 17:01:58 -0000 1.2
+++ rpm/scripts/yum_primary_xml 25 Jan 2009 18:38:01 -0000 1.3
@@ -1,3 +1,4 @@
+"\
<package type=\"rpm\">\
\n <name>%{NAME:cdata}</name>\
\n <arch>%{ARCH:cdata}</arch>\
@@ -77,4 +78,5 @@
]\
}|\
\n </format>\
-\n</package>
+\n</package>\
+\n"
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/Makefile.am
============================================================================
$ cvs diff -u -r2.117 -r2.118 Makefile.am
--- rpm/tools/Makefile.am 17 Jan 2009 19:41:30 -0000 2.117
+++ rpm/tools/Makefile.am 25 Jan 2009 18:38:02 -0000 2.118
@@ -70,6 +70,7 @@
rpmmtree_LDADD = $(RPM_LDADD_COMMON)
rpmrepo_SOURCES = rpmrepo.c
+rpmrepo_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/scripts $(CPPFLAGS)
rpmrepo_LDADD = $(RPM_LDADD_COMMON)
rpmspecdump_SOURCES = rpmspecdump.c
@@ .
patch -p0 <<'@@ .'
Index: rpm/tools/rpmrepo.c
============================================================================
$ cvs diff -u -r2.11 -r2.12 rpmrepo.c
--- rpm/tools/rpmrepo.c 25 Jan 2009 16:29:11 -0000 2.11
+++ rpm/tools/rpmrepo.c 25 Jan 2009 18:38:02 -0000 2.12
@@ -201,114 +201,19 @@
/* XXX todo: wire up popt aliases and bury the --queryformat glop externally. */
/*@unchecked@*/ /*@observer@*/
-static const char primary_xml_qfmt[] = "\
-<package type=\"rpm\">\
-\n <name>%{NAME:cdata}</name>\
-\n <arch>%{ARCH:cdata}</arch>\
-\n <version epoch=\"%|EPOCH?{%{EPOCH}}:{0}|\" ver=\"%{VERSION:cdata}\" \
rel=\"%{RELEASE:cdata}\"/>\
-\n <checksum type=\"sha\" \
pkgid=\"YES\">%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|</checksum>\
-\n <summary>%{SUMMARY:cdata}</summary>\
-\n <description>%{DESCRIPTION:cdata}</description>\
-\n <packager>%|PACKAGER?{%{PACKAGER:cdata}}:{}|</packager>\
-\n <url>%|URL?{%{URL:cdata}}:{}|</url>\
-\n <time file=\"%{PACKAGETIME}\" build=\"%{BUILDTIME}\"/>\
-\n <size package=\"%{PACKAGESIZE}\" installed=\"%{SIZE}\" \
archive=\"%{ARCHIVESIZE}\"/>\
-\n <location %|PACKAGEBASEURL?{xml:base=\"%{PACKAGEBASEURL:cdata}\" \
}|href=\"%{PACKAGEORIGIN:bncdata}\"/>\
-\n <format>\
-%|license?{\
-\n <rpm:license>%{LICENSE:cdata}</rpm:license>\
-}:{\
-\n <rpm:license/>\
-}|\
-%|vendor?{\
-\n <rpm:vendor>%{VENDOR:cdata}</rpm:vendor>\
-}:{\
-\n <rpm:vendor/>\
-}|\
-%|group?{\
-\n <rpm:group>%{GROUP:cdata}</rpm:group>\
-}:{\
-\n <rpm:group/>\
-}|\
-%|buildhost?{\
-\n <rpm:buildhost>%{BUILDHOST:cdata}</rpm:buildhost>\
-}:{\
-\n <rpm:buildhost/>\
-}|\
-%|sourcerpm?{\
-\n <rpm:sourcerpm>%{SOURCERPM:cdata}</rpm:sourcerpm>\
-}|\
-\n <rpm:header-range start=\"%{HEADERSTARTOFF}\" end=\"%{HEADERENDOFF}\"/>\
-%|providexmlentry?{\
-\n <rpm:provides>\
-[\
-\n %{providexmlentry}\
-]\
-\n </rpm:provides>\
-}:{\
-\n <rpm:provides/>\
-}|\
-%|requirexmlentry?{\
-\n <rpm:requires>\
-[\
-\n %{requirexmlentry}\
-]\
-\n </rpm:requires>\
-}:{\
-\n <rpm:requires/>\
-}|\
-%|conflictxmlentry?{\
-\n <rpm:conflicts>\
-[\
-\n %{conflictxmlentry}\
-]\
-\n </rpm:conflicts>\
-}:{\
-\n <rpm:conflicts/>\
-}|\
-%|obsoletexmlentry?{\
-\n <rpm:obsoletes>\
-[\
-\n %{obsoletexmlentry}\
-]\
-\n </rpm:obsoletes>\
-}:{\
-\n <rpm:obsoletes/>\
-}|\
-%|filesxmlentry1?{\
-[\
-\n %{filesxmlentry1}\
-]\
-}|\
-\n </format>\
-\n</package>\
-\n";
+static const char primary_xml_qfmt[] =
+#include "yum_primary_xml"
+;
/*@unchecked@*/ /*@observer@*/
-static const char filelists_xml_qfmt[] = "\
-<package pkgid=\"%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|\" name=\"%{NAME:cdata}\" \
arch=\"%{ARCH:cdata}\">\
-\n <version epoch=\"%|EPOCH?{%{EPOCH}}:{0}|\" ver=\"%{VERSION:cdata}\" \
rel=\"%{RELEASE:cdata}\"/>\
-%|filesxmlentry2?{\
-[\
-\n %{filesxmlentry2}\
-]\
-}|\
-\n</package>\
-\n";
+static const char filelists_xml_qfmt[] =
+#include "yum_filelists_xml"
+;
/*@unchecked@*/ /*@observer@*/
-static const char other_xml_qfmt[] = "\
-<package pkgid=\"%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|\" name=\"%{NAME:cdata}\" \
arch=\"%{ARCH:cdata}\">\
-\n <version epoch=\"%|EPOCH?{%{EPOCH}}:{0}|\" ver=\"%{VERSION:cdata}\" \
rel=\"%{RELEASE:cdata}\"/>\
-%|changelogname?{\
-[\
-\n <changelog author=\"%{CHANGELOGNAME:cdata}\" \
date=\"%{CHANGELOGTIME}\">%{CHANGELOGTEXT:cdata}</changelog>\
-]\
-}:{\
-\n <changelog/>\
-}|\
-\n</package>\
-\n";
+static const char other_xml_qfmt[] =
+#include "yum_other_xml"
+;
/*@-nullassign@*/
/*@unchecked@*/ /*@observer@*/
@@ -437,61 +342,9 @@
/* files 3 type TEXT */
/*@unchecked@*/ /*@observer@*/
-static const char primary_sql_qfmt[] = "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
-,\n '%{NAME:sqlescape}'\
-, '%{ARCH:sqlescape}'\
-, '%{VERSION:sqlescape}'\
-, '%|EPOCH?{%{EPOCH}}:{0}|'\
-, '%{RELEASE:sqlescape}'\
-,\n '%{SUMMARY:sqlescape}'\
-,\n '%{DESCRIPTION:sqlescape}'\
-,\n '%|URL?{%{URL:sqlescape}}|'\
-, '%{PACKAGETIME}'\
-, '%{BUILDTIME}'\
-, '%|license?{%{LICENSE:sqlescape}}|'\
-,\n '%|vendor?{%{VENDOR:sqlescape}}|'\
-, '%|group?{%{GROUP:sqlescape}}|'\
-,\n '%|buildhost?{%{BUILDHOST:sqlescape}}|'\
-, '%|sourcerpm?{%{SOURCERPM:sqlescape}}|'\
-,\n '%{HEADERSTARTOFF}'\
-, '%{HEADERENDOFF}'\
-, '%|PACKAGER?{%{PACKAGER:sqlescape}}|'\
-, '%{PACKAGESIZE}'\
-, '%{SIZE}'\
-, '%{ARCHIVESIZE}'\
-,\n '%{PACKAGEORIGIN:bncdata}'\
-,\n '%{PACKAGEBASEURL:sqlescape}'\
-, 'sha'\
-);\
-%|obsoletename?{[\
-\nINSERT into obsoletes values (\
-%{obsoletesqlentry}\
-);\
-]}|\
-%|providename?{[\
-\nINSERT into provides values (\
-%{providesqlentry}\
-);\
-]}|\
-%|conflictname?{[\
-\nINSERT into conflicts values (\
-%{conflictsqlentry}\
-);\
-]}|\
-%|requirename?{[\
-\nINSERT into requires values (\
-%{requiresqlentry}\
-);\
-]}|\
-%|basenames?{[\
-\nINSERT into files values (\
-%{filessqlentry1}\
-);\
-]}|\
-";
+static const char primary_sql_qfmt[] =
+#include "yum_primary_sqlite"
+;
/* packages 1 pkgKey INTEGER PRIMARY KEY */
/* packages 2 pkgId TEXT */
@@ -500,17 +353,9 @@
/* filelist 3 type TEXT */
/*@unchecked@*/ /*@observer@*/
-static const char filelists_sql_qfmt[] = "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
-);\
-%|basenames?{[\
-\nINSERT into filelist values (\
-%{filessqlentry2}\
-);\
-]}|\
-";
+static const char filelists_sql_qfmt[] =
+#include "yum_filelists_sqlite"
+;
/* packages 1 pkgKey INTEGER PRIMARY KEY */
/* packages 2 pkgId TEXT */
@@ -520,22 +365,9 @@
/* changelog 4 changelog TEXT */
/*@unchecked@*/ /*@observer@*/
-static const char other_sql_qfmt[] = "\
-INSERT into packages values (\
-'%{DBINSTANCE}'\
-, '%|PACKAGEDIGEST?{%{PACKAGEDIGEST}}|'\
-);\
-%|changelogname?{[\
-\nINSERT into changelog values (\
-'XXX'\
-, '%{CHANGELOGNAME:sqlescape}'\
-, '%{CHANGELOGTIME}'\
-, '%{CHANGELOGTEXT:sqlescape}'\
-);\
-]}:{\
-\nINSERT into changelog ('%{DBINSTANCE}', '', '', '');\
-}|\
-";
+static const char other_sql_qfmt[] =
+#include "yum_other_sqlite"
+;
/*@-fullinitblock@*/
/*@unchecked@*/
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic