[prev in list] [next in list] [prev in thread] [next in thread] 

List:       rpm-cvs
Subject:    [CVS] RPM: rpm-5_4: rpm/lib/ transaction.c
From:       "Jeff Johnson" <jbj () rpm5 ! org>
Date:       2016-02-27 21:03:42
Message-ID: 20160227210342.062EC63864 () rpm5 ! org
[Download RAW message or body]

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

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   27-Feb-2016 22:03:42
  Branch: rpm-5_4                          Handle: 2016022721034100

  Modified files:           (Branch: rpm-5_4)
    rpm/lib                 transaction.c

  Log:
    From 67ec7531e6297200eaa97ef917d49b0a75876cb4 Mon Sep 17 00:00:00 2001
    From: Robert Yang <liezhi.yang@windriver.com>
    Date: Wed, 2 Dec 2015 00:56:07 -0800
    Subject: [PATCH] lib/transaction.c: fix file conflicts for MIPS64 N32
    
    The following error can occur:
      smart install libc6-2.22-r0.1@lib32_mips32r2octeon3 libc6-dbg-2.22-r0.1@lib32_
    mips32r2octeon3
    error: file /sbin/ldconfig conflicts between attempted installs of libc6-2.22-r0
    .1.lib32_mips32r2octeon3 and libc6-2.22-r0.1.octeon3_n32
    error: file /sbin/.debug/ldconfig conflicts between attempted installs of libc6-
    dbg-2.22-r0.1.lib32_mips32r2octeon3 and libc6-dbg-2.22-r0.1.octeon3_n32
    
    This was because:
    transactions_color = 001 (ELF32) & 010 (ELF64) & 100 (ELF32 N32 MIPS64)
    FColor = Current file color (001) & transaction_color (111)
    oFcolor = Previous file color (100) & transaction_color (111)
    
    There are two places where the conflict comparisons occur.  In both places
    the 'else' clause was too restrictive (opposite of the 'positive' clause).
    This caused the system to only permit a binary comparison - "new preferred" or
    "old preferred".  It did not permissing "neither preferred".  By removing the
    else comparison the system will now perform a 'last-in-wins' resolution when
    "neither is preferred".
    
    Upstream-Status: Pending
    
    Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
    Signed-off-by: Mark Hatle <mark.hatle@windriver.com>

  Summary:
    Revision    Changes     Path
    1.429.2.17  +2  -2      rpm/lib/transaction.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/lib/transaction.c
  ============================================================================
  $ cvs diff -u -r1.429.2.16 -r1.429.2.17 transaction.c
  --- rpm/lib/transaction.c	11 May 2015 21:10:17 -0000	1.429.2.16
  +++ rpm/lib/transaction.c	27 Feb 2016 21:03:41 -0000	1.429.2.17
  @@ -166,7 +166,7 @@
   		fi->actions[fx] = FA_SKIPCOLOR;
   #endif
   		rConflicts = 0;
  -	    } else if (FColor & prefcolor) {
  +	    } else {
   #ifdef	REFERENCE
   		rpmfsSetAction(fs, fx, FA_CREATE);
   #else
  @@ -432,7 +432,7 @@
   			fi->actions[i] = FA_SKIPCOLOR;
   			rConflicts = 0;
   		    } else
  -		    if (FColor == 0 && oFColor == 0) {
  +		    {
   			/* ... otherwise, do both, last in wins. */
   			otherFi->actions[otherFileNum] = FA_CREATE;
   			fi->actions[i] = FA_CREATE;
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org
[prev in list] [next in list] [prev in thread] [next in thread]