Hide Forgot
Created attachment 1114342 [details] purple-url-handler Description of problem: See steps to reproduce. I'm not sure if this is a bug in diffutils or patch... Version-Release number of selected component (if applicable): diffutils-3.3-12.fc23.x86_64 patch-2.7.5-2.fc23.x86_64 Steps to Reproduce: 1. diff purple-url-handler purple-url-handler.new > tmp.patch 2. patch < tmp.patch patch: **** Only garbage was found in the patch input. Actual results: Error. Expected results: Patch works. Additional info: It doesn't matter if the unified format is used or not. Also, the behavior is the same on RHEL-7.2 with diffutils-3.3-4.el7.x86_64 and patch-2.7.1-8.el7.x86_64.
Created attachment 1114343 [details] purple-url-handler.new
Created attachment 1114344 [details] tmp.patch tmp.patch as it came out on my machine, in case it's needed.
As bizzare as this may sound, I can't fix https://bugzilla.redhat.com/show_bug.cgi?id=1245310 because of this.
Is there a reason you're not using diff's -u switch to specify that you want 'unified' format output? When using diff with no options and two files are arguments, you'll get 'normal' format diff output with no filename header. This means you'll need to tell patch which file to apply the diff to. For example: diff purple-url-handler purple-url-handler.new > tmp.patch patch purple-url-handler < tmp.patch
Well, the problem seems to be between the chair and the machine... The patch works fine if applied manually, it just doesn't work when I'm building an rpm using fedpkg... Anyway, this is not a patch/diffutils bug. Sorry for the noise.