[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c

2011-07-12 Thread Per �yvind Karlsen 
  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:   12-Jul-2011 12:44:06
  Branch: rpm-5_4  Handle: 2011071210440501

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmdb   rpmevr.c

  Log:
fix rpm not comparing distepoch if missing from one package when doing
comparision.

  Summary:
RevisionChanges Path
1.3501.2.147+2  -0  rpm/CHANGES
2.170.2.10  +1  -1  rpm/lib/rpmds.c
1.37.2.3+1  -1  rpm/rpmdb/rpmevr.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.146 -r1.3501.2.147 CHANGES
  --- rpm/CHANGES   12 Jul 2011 10:42:58 -  1.3501.2.146
  +++ rpm/CHANGES   12 Jul 2011 10:44:06 -  1.3501.2.147
  @@ -1,4 +1,6 @@
   5.4.1 - 5.4.2
  +- proyvind: fix rpm not comparing distepoch if missing from one package
  + when doing comparision.
   - proyvind: fix rpm treating packages of same NVRA, but different 
distepoch
as equal, preventing upgrades between them.
   - proyvind: dbconvert: fix segfault when no root is specified.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.170.2.9 -r2.170.2.10 rpmds.c
  --- rpm/lib/rpmds.c   11 Apr 2011 05:09:55 -  2.170.2.9
  +++ rpm/lib/rpmds.c   12 Jul 2011 10:44:05 -  2.170.2.10
  @@ -4065,7 +4065,7 @@
   case 'D':ix = RPMEVR_D;  /*@switchbreak@*/break;
   }
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  - if(ix = RPMEVR_R  (bFlags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
  + if(ix == RPMEVR_R  (bFlags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
 *(b-F[ix]) == '\0')
break;
if (a-F[ix]  b-F[ix])
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmevr.c
  
  $ cvs diff -u -r1.37.2.2 -r1.37.2.3 rpmevr.c
  --- rpm/rpmdb/rpmevr.c20 Apr 2011 15:57:00 -  1.37.2.2
  +++ rpm/rpmdb/rpmevr.c12 Jul 2011 10:44:05 -  1.37.2.3
  @@ -286,7 +286,7 @@
case 'D':   ix = RPMEVR_D;  /*@switchbreak@*/break;
}
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  - if(ix = RPMEVR_R  (b-Flags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
  + if(ix == RPMEVR_R  (b-Flags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
 *(b-F[ix]) == '\0')
break;
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/macros/ mandriva.in

2011-07-12 Thread Per �yvind Karlsen 
  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:   12-Jul-2011 12:44:19
  Branch: rpm-5_4  Handle: 2011071210441900

  Modified files:   (Branch: rpm-5_4)
rpm/macros  mandriva.in

  Log:
change dependency loop errors to warnings

  Summary:
RevisionChanges Path
1.7.2.10+2  -2  rpm/macros/mandriva.in
  

  patch -p0 '@@ .'
  Index: rpm/macros/mandriva.in
  
  $ cvs diff -u -r1.7.2.9 -r1.7.2.10 mandriva.in
  --- rpm/macros/mandriva.in4 May 2011 12:19:54 -   1.7.2.9
  +++ rpm/macros/mandriva.in12 Jul 2011 10:44:19 -  1.7.2.10
  @@ -75,9 +75,9 @@
   %__xar   %{_bindir}/xar
   
   # mdvbz#61851
  -%__tar_wildcards   --wildcards
  +%__tar_wildcards --wildcards
   
  -%_loop_detection_loglevel 3
  +%_loop_detection_loglevel 4
   
   # mdvbz#62741
   # standard systemd directories
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/ CHANGES rpm/lib/ rpmds.c rpm/rpmdb/ rpmevr.c

2011-07-12 Thread Per �yvind Karlsen 
  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:   12-Jul-2011 12:45:07
  Branch: rpm-5_3  Handle: 2011071210450302

  Modified files:   (Branch: rpm-5_3)
rpm CHANGES
rpm/lib rpmds.c
rpm/rpmdb   rpmevr.c

  Log:
fix rpm not comparing distepoch if missing from one package when doing
comparision.

  Summary:
RevisionChanges Path
1.3296.2.244+2  -0  rpm/CHANGES
2.167.2.16  +1  -1  rpm/lib/rpmds.c
1.36.2.4+1  -1  rpm/rpmdb/rpmevr.c
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3296.2.243 -r1.3296.2.244 CHANGES
  --- rpm/CHANGES   12 Jul 2011 10:44:41 -  1.3296.2.243
  +++ rpm/CHANGES   12 Jul 2011 10:45:05 -  1.3296.2.244
  @@ -1,4 +1,6 @@
   5.3.12 - 5.3.13
  +- proyvind: fix rpm not comparing distepoch if missing from one package
  + when doing comparision.
   - proyvind: fix rpm treating packages of same NVRA, but different 
distepoch
as equal, preventing upgrades between them.
   - proyvind: dbconvert: fix segfault when no root is specified.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/rpmds.c
  
  $ cvs diff -u -r2.167.2.15 -r2.167.2.16 rpmds.c
  --- rpm/lib/rpmds.c   28 Apr 2011 15:49:04 -  2.167.2.15
  +++ rpm/lib/rpmds.c   12 Jul 2011 10:45:03 -  2.167.2.16
  @@ -4333,7 +4333,7 @@
   case 'D':ix = RPMEVR_D;  /*@switchbreak@*/break;
   }
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  - if(ix = RPMEVR_R  (bFlags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
  + if(ix == RPMEVR_R  (bFlags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
 *(b-F[ix]) == '\0')
break;
if (a-F[ix]  b-F[ix])
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmevr.c
  
  $ cvs diff -u -r1.36.2.3 -r1.36.2.4 rpmevr.c
  --- rpm/rpmdb/rpmevr.c20 Apr 2011 16:17:09 -  1.36.2.3
  +++ rpm/rpmdb/rpmevr.c12 Jul 2011 10:45:04 -  1.36.2.4
  @@ -286,7 +286,7 @@
case 'D':   ix = RPMEVR_D;  /*@switchbreak@*/break;
}
   #if defined(RPM_VENDOR_MANDRIVA) /* mdvbz#55810 */
  - if(ix = RPMEVR_R  (b-Flags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
  + if(ix == RPMEVR_R  (b-Flags  (~RPMSENSE_GREATER  RPMSENSE_EQUAL))
 *(b-F[ix]) == '\0')
break;
   #endif
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/macros/ mandriva.in

2011-07-12 Thread Per �yvind Karlsen 
  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:   12-Jul-2011 12:45:17
  Branch: rpm-5_3  Handle: 2011071210451600

  Modified files:   (Branch: rpm-5_3)
rpm/macros  mandriva.in

  Log:
change dependency loop errors to warnings

  Summary:
RevisionChanges Path
1.1.2.19+2  -2  rpm/macros/mandriva.in
  

  patch -p0 '@@ .'
  Index: rpm/macros/mandriva.in
  
  $ cvs diff -u -r1.1.2.18 -r1.1.2.19 mandriva.in
  --- rpm/macros/mandriva.in4 May 2011 12:20:06 -   1.1.2.18
  +++ rpm/macros/mandriva.in12 Jul 2011 10:45:16 -  1.1.2.19
  @@ -75,9 +75,9 @@
   %__xar   %{_bindir}/xar
   
   # mdvbz#61851
  -%__tar_wildcards   --wildcards
  +%__tar_wildcards --wildcards
   
  -%_loop_detection_loglevel 3
  +%_loop_detection_loglevel 4
   
   # mdvbz#62741
   # standard systemd directories
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org