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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  [EMAIL PROTECTED]
  Module: rpm                              Date:   12-Mar-2008 17:16:53
  Branch: rpm-5_0                          Handle: 2008031216165300

  Modified files:           (Branch: rpm-5_0)
    rpm                     CHANGES
    rpm/lib                 depends.c

  Log:
    - jbj: prepare for Fedorable dependency loops (#437041).

  Summary:
    Revision    Changes     Path
    1.2054.2.56 +1  -0      rpm/CHANGES
    1.377.2.3   +1  -1      rpm/lib/depends.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2054.2.55 -r1.2054.2.56 CHANGES
  --- rpm/CHANGES       5 Mar 2008 17:12:31 -0000       1.2054.2.55
  +++ rpm/CHANGES       12 Mar 2008 16:16:53 -0000      1.2054.2.56
  @@ -1,4 +1,5 @@
   5.0.3 -> 5.0.4:
  +    - jbj: prepare for Fedorable dependency loops (#437041).
       - proyvind: add more compatibility adaptions to rpm4 compatibility 
wrapper (making deltarpm & ruby-rpm work)
       - proyvind: add rpmfiBuildFNames() to rpm4 compatibility wrapper (needed 
by rpmstats)
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/depends.c
  ============================================================================
  $ cvs diff -u -r1.377.2.2 -r1.377.2.3 depends.c
  --- rpm/lib/depends.c 7 Feb 2008 22:15:32 -0000       1.377.2.2
  +++ rpm/lib/depends.c 12 Mar 2008 16:16:53 -0000      1.377.2.3
  @@ -587,7 +587,7 @@
   #endif
       int rc;
       int xx;
  -    int retries = 10;
  +    int retries = 20;
   
       if ((Name = rpmdsN(dep)) == NULL)
        return 0;       /* XXX can't happen */
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to