Hi Marcelo,

I asked Peter which commit solved the problem and I'm waiting for a response from him. While waiting for his response, I looked at the 1.7.2 release commits at https://github.com/phaag/nfdump/compare/v1.7.2...master and saw this line:

Update nfprofile:
phaag committed on May 5
https://github.com/phaag/nfdump/commit/18a34c16b6d070323d3d44cb22af48a85ac9b0c5

But I can't tell you exactly if it was this commit that solved the problem.

Have you tested with the plain 1.7.2 release and it was still broken? So the commit that fixes _your_ issue was introduced after 1.7.2 has been released?

The commit you mention is quite intrusive (a lot of source cleanup mixed with the bugfix) and does not apply to 1.7.1

patching file src/lib/nffile.c
Hunk #2 FAILED at 39.
Hunk #3 succeeded at 50 (offset -1 lines).
Hunk #4 succeeded at 180 (offset -6 lines).
Hunk #5 succeeded at 210 (offset -6 lines).
Hunk #6 succeeded at 233 (offset -6 lines).
Hunk #7 succeeded at 256 (offset -6 lines).
Hunk #8 succeeded at 285 (offset -6 lines).
Hunk #9 succeeded at 318 (offset -6 lines).
Hunk #10 FAILED at 890.
Hunk #11 succeeded at 911 (offset -4 lines).
2 out of 11 hunks FAILED
patching file src/nfdump/nfdump.c
patching file src/nfsen/nfprofile.c
Hunk #1 succeeded at 100 (offset 1 line).
Hunk #2 succeeded at 122 (offset 1 line).
Hunk #3 succeeded at 164 (offset 1 line).
Hunk #4 succeeded at 176 (offset 1 line).
Hunk #5 succeeded at 191 (offset 1 line).
Hunk #6 succeeded at 205 (offset 1 line).
Hunk #7 succeeded at 218 (offset 1 line).
Hunk #8 succeeded at 244 (offset 1 line).
Hunk #9 FAILED at 292.
Hunk #10 succeeded at 317 (offset 1 line).
1 out of 10 hunks FAILED
patching file src/nfsen/profile.c

There are so many code changes between 1.7.1 and this commit that I would feel _very_ uncomfortable beating this specific commit into applying.

Bernhard

Reply via email to