On Fri, 13 Jun 2008, Troy Dawson wrote:

> Dr Andrew C Aitchison wrote:
>>  On this the default umask is 066 (user request, but I think I'll
>>  revert to 022 for root). After updating rpm and SL_rpm_show_arch
>>  the rpm command failed with permission problems.

> Your patch didn't quite make it in the e-mail.  It's just a list of 
> directories.
> Could you resend it.

Sorry. Should be atteched this time.

-- 
Dr. Andrew C. Aitchison		Computer Officer, DPMMS, Cambridge
[log in to unmask]	http://www.dpmms.cam.ac.uk/~werdna



--- SL_rpm_show_arch.spec	2008/06/13 15:41:14	1.1

+++ SL_rpm_show_arch.spec	2008/06/13 15:46:18

@@ -24,8 +24,7 @@

 #

 if [ -f %{targetfile} ] ; then

 	if ! `grep -q %%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch} %{targetfile}` ; then

-		cat %{targetfile} | sed -e "s:%%%%{name}-%%%%{version}-%%%%{release}:%%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch}:"  > %{targetfile}.tmp

-		mv -f %{targetfile}.tmp %{targetfile}

+		sed -i -e "s:%%%%{name}-%%%%{version}-%%%%{release}:%%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch}:"  %{targetfile}

 	fi

 fi

 

@@ -35,8 +34,7 @@

 	# This modifies /usr/lib/rpm/macros to add the arch to queries

 	#

 	if [ -f %{targetfile} ] ; then

-		cat %{targetfile} | sed -e "s:%%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch}:%%%%{name}-%%%%{version}-%%%%{release}:"  > %{targetfile}.tmp

-		mv -f %{targetfile}.tmp %{targetfile}

+		sed -i -e "s:%%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch}:%%%%{name}-%%%%{version}-%%%%{release}:"  %{targetfile}

 	fi

 fi

 

@@ -44,7 +42,8 @@

 if [ -f %{targetfile} ] ; then

 	if ! `grep -q %%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch} %{targetfile}` ; then

 		cat %{targetfile} | sed -e "s:%%%%{name}-%%%%{version}-%%%%{release}:%%%%{name}-%%%%{version}-%%%%{release}.%%%%{arch}:"  > %{targetfile}.tmp

-		mv -f %{targetfile}.tmp %{targetfile}

+		cat %{targetfile}.tmp > %{targetfile}

+		rm %{targetfile}.tmp

 	fi

 fi