View | Details | Raw Unified | Return to bug 252054 | Differences between
and this patch

Collapse All | Expand All

(-)b/usr.sbin/mergemaster/mergemaster.sh (-7 / +15 lines)
Lines 1128-1140 for COMPFILE in `find . -type f | sort`; do Link Here
1128
    #
1128
    #
1129
    ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
1129
    ID1=`grep "[$]${ID_TAG}:" ${DESTDIR}${COMPFILE#.} 2>/dev/null`
1130
    ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none
1130
    ID2=`grep "[$]${ID_TAG}:" ${COMPFILE} 2>/dev/null` || ID2=none
1131
1131
    # Compare timestamps to workarodund git tag removal
1132
    case "${ID2}" in
1132
    TS1=`stat -f %m ${DESTDIR}${COMPFILE#.} 2>/dev/null`
1133
    "${ID1}")
1133
    TS2=`stat -f %m ${COMPFILE} 2>/dev/null`
1134
      echo " *** Temp ${COMPFILE} and installed have the same Id, deleting"
1134
    TSDIFF=`expr ${TS2} - ${TS1}`
1135
      rm "${COMPFILE}"
1135
    if [ ${ID2} = "none" -a ${TSDIFF} -gt 0 ] ; then 
1136
      ;;
1136
	echo " *** ${COMPFILE} in sources is older than installed one, deleting"
1137
    esac
1137
	rm "${COMPFILE}"
1138
    else
1139
	case "${ID2}" in
1140
	"${ID1}")
1141
	  echo " *** Temp ${COMPFILE} and installed have the same Id, deleting"
1142
	  rm "${COMPFILE}"
1143
	  ;;
1144
	esac
1145
    fi
1138
    ;;
1146
    ;;
1139
  esac
1147
  esac
1140
1148

Return to bug 252054