RPM Package Manager, CVS Repository
  /cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   13-Aug-2010 16:18:17
  Branch: rpm-5_3                          Handle: 2010081314181601

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

  Log:
    - solve: flip --aid "opt-in" behavior to --noaid "opt-out".

  Summary:
    Revision    Changes     Path
    1.3296.2.53 +1  -0      rpm/CHANGES
    2.139.2.1   +3  -3      rpm/lib/poptALL.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3296.2.52 -r1.3296.2.53 CHANGES
  --- rpm/CHANGES	13 Aug 2010 14:16:54 -0000	1.3296.2.52
  +++ rpm/CHANGES	13 Aug 2010 14:18:16 -0000	1.3296.2.53
  @@ -1,4 +1,5 @@
   5.3.2 -> 5.3.3:
  +    - jbj: solve: flip --aid "opt-in" behavior to --noaid "opt-out".
       - jbj: solve: fix: don't free the package file name when depsolving.
       - jbj: fix: debugedit produce empty list file on MIPS.
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.139 -r2.139.2.1 poptALL.c
  --- rpm/lib/poptALL.c	26 Dec 2009 02:06:13 -0000	2.139
  +++ rpm/lib/poptALL.c	13 Aug 2010 14:18:17 -0000	2.139.2.1
  @@ -337,12 +337,12 @@
   }
   
   /*@unchecked@*/
  -int global_depFlags;
  +int global_depFlags = RPMDEPS_FLAG_ADDINDEPS;
   
   /*@unchecked@*/
   struct poptOption rpmcliDepFlagsPoptTable[] = {
  - { "aid", '\0', POPT_BIT_SET, &global_depFlags, RPMDEPS_FLAG_ADDINDEPS,
  -	N_("Add suggested packages to transaction"), NULL },
  + { "noaid", '\0', POPT_BIT_CLR|POPT_ARGFLAG_TOGGLE, &global_depFlags, RPMDEPS_FLAG_ADDINDEPS,
  +	N_("Add packages to resolve dependencies"), NULL },
    { "anaconda", '\0', POPT_BIT_SET|POPT_ARGFLAG_DOC_HIDDEN,
    	&global_depFlags, RPMDEPS_FLAG_ANACONDA|RPMDEPS_FLAG_DEPLOOPS,
   	N_("Use anaconda \"presentation order\""), NULL},
  @@ .