'Twas brillig, and Becker, VincentX at 24/03/11 13:51 did gyre and gimble: >> Sorry but this is not based on git master.... (as Maarten asked >> for before). >> >> [colin at jimmy pulseaudio (master|AM)]$ cat ~/Download/pa.patch | >> patch -p1 --dry-run patching file src/daemon/daemon-conf.c Hunk #1 >> FAILED at 142. Hunk #2 FAILED at 170. Hunk #3 succeeded at 187 >> (offset -5 lines). Hunk #4 FAILED at 235. 3 out of 4 hunks FAILED >> -- saving rejects to file src/daemon/daemon- conf.c.rej >> >> I think it's just a matter of ignoring hunks 1 & 2 anyway (as I >> already made that change when I committed the original version) and >> the move from 4 to 3 should just be updated as the code in hunk 4 >> was updated (tho' the newer code is the same as you put in in your >> hunk 3). >> > > Sorry I am still learning with git. I thought that taking the code > as-is was enough. I have just sent a patch back to you from master > branch, and it should be OK, I hope. Yeah that's fine. It's more or less the same as the one I attached last time but with a couple minor formatting differences. I've pushed a slightly modified version (both from my last one and your one!) just to be annoying ;) I only change some bracketing and log message formatting, so totally trivial. Thanks for the fix ups :) I'll try and look at the second patch to do with optimising the actual log writing sometime very soon. Cheers Col -- Colin Guthrie gmane(at)colin.guthr.ie http://colin.guthr.ie/ Day Job: Tribalogic Limited [http://www.tribalogic.net/] Open Source: Mageia Contributor [http://www.mageia.org/] PulseAudio Hacker [http://www.pulseaudio.org/] Trac Hacker [http://trac.edgewall.org/]
