[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/ rpmpopt.in rpm/scripts/...
From: "Jeff Johnson" <jbj () rpm5 ! org>
Date: 2009-01-25 17:01:59
Message-ID: 20090125170159.42840217AF2 () 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 18:01:59
Branch: HEAD Handle: 2009012517015801
Modified files:
rpm CHANGES rpmpopt.in
rpm/lib poptQV.c
rpm/scripts yum_primary_xml
Log:
- blueprint/use yum:{primary,filelists,other}.xml queryformats.
Summary:
Revision Changes Path
1.2757 +1 -0 rpm/CHANGES
2.60 +2 -0 rpm/lib/poptQV.c
2.74 +4 -105 rpm/rpmpopt.in
1.2 +4 -4 rpm/scripts/yum_primary_xml
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.2756 -r1.2757 CHANGES
--- rpm/CHANGES 25 Jan 2009 16:31:17 -0000 1.2756
+++ rpm/CHANGES 25 Jan 2009 17:01:58 -0000 1.2757
@@ -1,5 +1,6 @@
5.2a2 -> 5.2a3:
+ - jbj: blueprint/use yum:{primary,filelists,other}.xml queryformats.
- jbj: install yum:{primary,filelists,other}.xml queryformats.
- jbj: use poptReadFile with retrofit for popt < 1.15.
- jbj: rude & crude backing store for --queryformat templates.
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.59 -r2.60 poptQV.c
--- rpm/lib/poptQV.c 25 Jan 2009 16:29:11 -0000 2.59
+++ rpm/lib/poptQV.c 25 Jan 2009 17:01:59 -0000 2.60
@@ -311,10 +311,12 @@
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;
}
@@ .
patch -p0 <<'@@ .'
Index: rpm/rpmpopt.in
============================================================================
$ cvs diff -u -r2.73 -r2.74 rpmpopt.in
--- rpm/rpmpopt.in 18 Jan 2009 04:09:17 -0000 2.73
+++ rpm/rpmpopt.in 25 Jan 2009 17:01:58 -0000 2.74
@@ -2,7 +2,7 @@
# \verbatim
#
# @USRLIBRPM@/@configure_input@
-# $Id: rpmpopt.in,v 2.73 2009/01/18 04:09:17 jbj Exp $
+# $Id: rpmpopt.in,v 2.74 2009/01/25 17:01:58 jbj Exp $
#
# This file *should not be modified*. Local customizations
# belong in /etc/popt, not here. This file will be replaced
@@ -255,88 +255,7 @@
--POPTdesc=$"display debian/md5sums manifest"
#==============================================================================
-rpm alias --yum:primary.xml --qf '\
-<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="NO">%|HDRID?{%{HDRID}}:{XXX}|</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}"/>\
-%|providename?{\
-\n <rpm:provides>\
-[\
-\n %{providexmlentry}\
-]\
-\n </rpm:provides>\
-}:{\
-\n <rpm:provides/>\
-\n}|\
-%|requirename?{\
-\n <rpm:requires>\
-[\
-\n %{requirexmlentry}\
-]\
-\n </rpm:requires>\
-}:{\
-\n <rpm:requires/>\
-}|\
-%|conflictname?{\
-\n <rpm:conflicts>\
-[\
-\n %{conflictxmlentry}\
-]\
-\n </rpm:conflicts>\
-}:{\
-\n <rpm:conflicts/>\
-}|\
-%|obsoletename?{\
-\n <rpm:obsoletes>\
-[\
-\n %{obsoletexmlentry}\
-]\
-\n </rpm:obsoletes>\
-}:{\
-\n <rpm:obsoletes/>\
-}|\
-%|filesxmlentry1?{\
-[\
-\n %{filesxmlentry1}\
-]\
-}|\
-\n </format>\
-\n</package>\
-\n' \
+rpm alias --yum:primary.xml --qf @USRLIBRPM@/qf/yum_primary_xml
--POPTdesc=$"display yum primary.xml markup"
rpm alias --yum:primary.sqlite --qf "\
@@ -474,16 +393,7 @@
\n'\
--POPTdesc=$"display yum primary.yaml markup"
-rpm alias --yum:filelists.xml --qf '\
-<package pkgid="%|HDRID?{%{HDRID}}:{XXX}|" name="%{NAME:cdata}" \
arch="%{ARCH:cdata}">\
-\n <version epoch="%|EPOCH?{%{EPOCH}}:{0}|" ver="%{VERSION:cdata}" \
rel="%{RELEASE:cdata}"/>\
-%|filesxmlentry2?{\
-[\
-\n %{filesxmlentry2}\
-]\
-}|\
-\n</package>\
-\n' \
+rpm alias --yum:filelists.xml --qf @USRLIBRPM@/qf/yum_filelists_xml
--POPTdesc=$"display yum filelists.xml markup"
rpm alias --yum:filelists.sqlite --qf "\
@@ -516,18 +426,7 @@
\n' \
--POPTdesc=$"display yum filelists.yaml markup"
-rpm alias --yum:other.xml --qf '\
-<package pkgid="%|HDRID?{%{HDRID}}:{XXX}|" 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' \
+rpm alias --yum:other.xml --qf @USRLIBRPM@/qf/yum_other_xml
--POPTdesc=$"display yum other.xml markup"
rpm alias --yum:other.sqlite --qf "\
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/yum_primary_xml
============================================================================
$ cvs diff -u -r1.1 -r1.2 yum_primary_xml
--- rpm/scripts/yum_primary_xml 25 Jan 2009 16:31:17 -0000 1.1
+++ rpm/scripts/yum_primary_xml 25 Jan 2009 17:01:58 -0000 1.2
@@ -35,7 +35,7 @@
\n <rpm:sourcerpm>%{SOURCERPM:cdata}</rpm:sourcerpm>\
}|\
\n <rpm:header-range start=\"%{HEADERSTARTOFF}\" end=\"%{HEADERENDOFF}\"/>\
-%|providexmlentry?{\
+%|providename?{\
\n <rpm:provides>\
[\
\n %{providexmlentry}\
@@ -44,7 +44,7 @@
}:{\
\n <rpm:provides/>\
}|\
-%|requirexmlentry?{\
+%|requirename?{\
\n <rpm:requires>\
[\
\n %{requirexmlentry}\
@@ -53,7 +53,7 @@
}:{\
\n <rpm:requires/>\
}|\
-%|conflictxmlentry?{\
+%|conflictname?{\
\n <rpm:conflicts>\
[\
\n %{conflictxmlentry}\
@@ -62,7 +62,7 @@
}:{\
\n <rpm:conflicts/>\
}|\
-%|obsoletexmlentry?{\
+%|obsoletename?{\
\n <rpm:obsoletes>\
[\
\n %{obsoletexmlentry}\
@@ .
______________________________________________________________________
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