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:51
  Branch: rpm-5_3                          Handle: 2010092902304702

  Modified files:           (Branch: rpm-5_3)
    rpm                     CHANGES
    rpm/lib                 poptQV.c

  Log:
    - fix: eliminate dueling --noorder options.

  Summary:
    Revision    Changes     Path
    1.3296.2.85 +1  -0      rpm/CHANGES
    2.67.2.1    +2  -0      rpm/lib/poptQV.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.84 -r1.3296.2.85 CHANGES
  --- rpm/CHANGES	29 Sep 2010 02:07:50 -0000	1.3296.2.84
  +++ rpm/CHANGES	29 Sep 2010 02:30:47 -0000	1.3296.2.85
  @@ -1,4 +1,5 @@
   5.3.4 -> 5.3.5:
  +    - 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.67.2.1 poptQV.c
  --- rpm/lib/poptQV.c	4 Jan 2010 03:51:37 -0000	2.67
  +++ rpm/lib/poptQV.c	29 Sep 2010 02:30:49 -0000	2.67.2.1
  @@ -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,
  @@ .