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:05:55
  Branch: rpm-5_2                          Handle: 2010081315055401

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

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

  Summary:
    Revision    Changes     Path
    1.2970.2.57 +1  -0      rpm/CHANGES
    2.129.2.3   +4  -4      rpm/lib/poptALL.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2970.2.56 -r1.2970.2.57 CHANGES
  --- rpm/CHANGES	22 Jul 2010 17:55:43 -0000	1.2970.2.56
  +++ rpm/CHANGES	13 Aug 2010 15:05:54 -0000	1.2970.2.57
  @@ -1,4 +1,5 @@
   5.2.1 -> 5.2.2:
  +    - jbj: solve: flip --aid "opt-in" behavior to --noaid "opt-out".
       - jbj: sqlite: fix: avoid assert failure w %trigger* SECONDARY-SEQUENTIAL
           retrieval using only secondary keys for performance.
       - jbj: fix: save chroot value across embedded scriptlet execution.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/poptALL.c
  ============================================================================
  $ cvs diff -u -r2.129.2.2 -r2.129.2.3 poptALL.c
  --- rpm/lib/poptALL.c	22 May 2009 17:40:31 -0000	2.129.2.2
  +++ rpm/lib/poptALL.c	13 Aug 2010 15:05:55 -0000	2.129.2.3
  @@ -289,7 +289,7 @@
   	rpmcliConfigured();
       {	const char * val = rpmcliEvalSlurp(arg);
   	size_t val_len = fwrite(val, strlen(val), 1, stdout);
  -	if (val[val_len - 1] != '\n')
  +	if (val_len > 0 && val[val_len - 1] != '\n')
   	    fprintf(stdout, "\n");
   	val = _free(val);
       }	break;
  @@ -341,12 +341,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},
  @@ .