On Mon, Oct 19, 2009 at 3:35 AM, Dan McGee <[email protected]> wrote:
> On Sat, Oct 17, 2009 at 4:54 PM, Laszlo Papp <[email protected]> wrote: > > Pacman's fgets function in the API used hardcoded numbers to identify the > size. > > This is not good practice, so replace them with sizeof handling. > > > > Signed-off-by: Laszlo Papp <[email protected]> > > --- > > Doesn't apply to git HEAD... > > dmc...@galway ~/projects/pacman (master) > $ git am -3 -s < /tmp/pacman-sizeof.patch > Applying: Size handling was changed in fgets() functions > Using index info to reconstruct a base tree... > error: patch failed: lib/libalpm/trans.c:320 > error: lib/libalpm/trans.c: patch does not apply > error: patch failed: src/pacman/util.c:580 > error: src/pacman/util.c: patch does not apply > Did you hand edit your patch? > It does not apply to blobs recorded in its index. > Cannot fall back to three-way merge. > Patch failed at 0001 Size handling was changed in fgets() functions > When you have resolved this problem run "git am -3 --resolved". > If you would prefer to skip this patch, instead run "git am -3 --skip". > To restore the original branch and stop patching run "git am -3 --abort". > > > > I don't know what's the problem by you, but it works here fine with this procedure: git clone git://projects.archlinux.org/pacman.git pacman && cd pacman && git checkout -b working && git apply 0001-Size-handling-was-changed-in-fgets-functions.patch Could you check it ? I've attached the patch file. Best Regards, Laszlo Papp
0001-Size-handling-was-changed-in-fgets-functions.patch.tar.gz
Description: GNU Zip compressed data
