Re: [PATCH] make file merging respect permissions
- From
Petr Baudis <pasky@ucw.cz>
- Date
- Apr 23, 2005, 23:02 UTC
- Message-ID
- <20050423230238.GD13222@pasky.ji.cz>
- In-Reply-To
- <1114292680.4799.4.camel@mulgrave>
Dear diary, on Sat, Apr 23, 2005 at 11:44:40PM CEST, I got a letter where James Bottomley <James.Bottomley@SteelEye.com> told me that...
Show 18 quoted lines
> On Sat, 2005-04-23 at 13:17 -0700, Linus Torvalds wrote: > > Yeah, yeah, you obviously meant "$?", but the fact > > is, your patch is bogus, and I don't trust it. Can you re-send a valid > > one > > (and sign off on it).] > > OK, here it is .. I have an excuse, honest ... and a note from my mum. > > + ret=$? > + if [ "$6" != "$7" ]; then > + echo "ERROR: Permissions $5->$6->$7 don't match merging $src2" > + if [ $ret -ne 0 ]; then > + echo "ERROR: Leaving conflict merge in $src2" > + fi > + exit 1 > + fi > + chmod -- "$6" "$src2" > + if [ $ -ne 0 ]; then
*cough*
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor