RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Per Øyvind Karlsen
  Root:   /v/rpm/cvs                       Email:  pkarl...@rpm5.org
  Module: rpm                              Date:   13-Jul-2011 16:49:50
  Branch: HEAD                             Handle: 2011071314494901

  Modified files:
    rpm/lib                 rpmds.c
    rpm/rpmdb               rpmevr.c

  Log:
    fix regression introduced in previous commit

  Summary:
    Revision    Changes     Path
    2.181       +4  -3      rpm/lib/rpmds.c
    1.41        +4  -3      rpm/rpmdb/rpmevr.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmds.c
  ============================================================================
  $ cvs diff -u -r2.180 -r2.181 rpmds.c
  --- rpm/lib/rpmds.c   12 Jul 2011 10:41:18 -0000      2.180
  +++ rpm/lib/rpmds.c   13 Jul 2011 14:49:49 -0000      2.181
  @@ -4065,9 +4065,10 @@
           case 'D':    ix = RPMEVR_D;  /*@switchbreak@*/break;
           }
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  -     if(ix == RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
  -                             && *(b->F[ix]) == '\0')
  -                         break;
  +     if(ix >= RPMEVR_R && (bFlags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
  +                     && !(ix == RPMEVR_D && (bFlags & RPMSENSE_LESS))
  +                     && *(b->F[ix]) == '\0')
  +             break;
        if (a->F[ix] && b->F[ix])
   #else
        if (a->F[ix] && *a->F[ix] && b->F[ix] && *b->F[ix])
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/rpmevr.c
  ============================================================================
  $ cvs diff -u -r1.40 -r1.41 rpmevr.c
  --- rpm/rpmdb/rpmevr.c        12 Jul 2011 10:41:19 -0000      1.40
  +++ rpm/rpmdb/rpmevr.c        13 Jul 2011 14:49:50 -0000      1.41
  @@ -286,9 +286,10 @@
        case 'D':       ix = RPMEVR_D;  /*@switchbreak@*/break;
        }
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  -     if(ix == RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
  -                             && *(b->F[ix]) == '\0')
  -                         break;
  +     if(ix >= RPMEVR_R && (b->Flags & (~RPMSENSE_GREATER & RPMSENSE_EQUAL))
  +                     && !(ix == RPMEVR_D && (b->Flags & RPMSENSE_LESS))
  +                     && *(b->F[ix]) == '\0')
  +             break;
   #endif
   
        rc = compare_values(a->F[ix], b->F[ix]);
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to