RPM Package Manager, CVS Repository
/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: jbj@rpm5.org
Module: rpm Date: 29-Sep-2010 04:30:20
Branch: HEAD Handle: 2010092902301502
Modified files:
rpm CHANGES
rpm/lib poptQV.c
Log:
- fix: eliminate dueling --noorder options.
Summary:
Revision Changes Path
1.3457 +1 -0 rpm/CHANGES
2.68 +2 -0 rpm/lib/poptQV.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3456 -r1.3457 CHANGES
--- rpm/CHANGES 29 Sep 2010 02:07:23 -0000 1.3456
+++ rpm/CHANGES 29 Sep 2010 02:30:15 -0000 1.3457
@@ -1,4 +1,5 @@
5.3.4 -> 5.4a1:
+ - jbj: fix: eliminate dueling --noorder options.
- jbj: solvedb's never need a chroot prefix.
5.3.3 -> 5.3.4:
@@ .
patch -p0 <<'@@ .'
Index: rpm/lib/poptQV.c
============================================================================
$ cvs diff -u -r2.67 -r2.68 poptQV.c
--- rpm/lib/poptQV.c 4 Jan 2010 03:51:37 -0000 2.67
+++ rpm/lib/poptQV.c 29 Sep 2010 02:30:17 -0000 2.68
@@ -185,8 +185,10 @@
{ "transaction", 'T', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, (RPMGI_TSADD|RPMGI_TSORDER),
N_("create transaction set"), NULL},
+#ifdef DYING /* XXX breaks --noorder in poptI.c */
{ "noorder", '\0', POPT_BIT_CLR|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, RPMGI_TSORDER,
N_("do not order transaction set"), NULL},
+#endif
{ "noglob", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN, &giFlags, RPMGI_NOGLOB,
N_("do not glob arguments"), NULL},
{ "nomanifest", '\0', POPT_BIT_SET, &giFlags, RPMGI_NOMANIFEST,
@@ .
Received on Wed Sep 29 04:30:28 2010