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 17:52:24
  Branch: rpm-5_1                          Handle: 2010081315522201

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

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

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

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2288.2.310 -r1.2288.2.311 CHANGES
  --- rpm/CHANGES	22 Jul 2010 18:01:29 -0000	1.2288.2.310
  +++ rpm/CHANGES	13 Aug 2010 15:52:22 -0000	1.2288.2.311
  @@ -1,4 +1,5 @@
   5.1.9 -> 5.1.10:
  +    - jbj: solve: flip --aid "opt-in" behavior to --noaid "opt-out".
       - jbj: tests: backport the IDMS install for coverage testing w sqlite3.
       - jbj: sqlite: fix: avoid assert failure w %trigger* SECONDARY-SEQENTIAL
   	retrieval using ony secondary keys for performance.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.90.2.23 -r2.90.2.24 poptALL.c
  --- rpm/lib/poptALL.c	18 Apr 2009 16:45:17 -0000	2.90.2.23
  +++ rpm/lib/poptALL.c	13 Aug 2010 15:52:23 -0000	2.90.2.24
  @@ -302,12 +302,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},
  @@ .