Project

General

Profile

Actions
Copy link

Bug #5941

closed

Synchronize rudder-agent-thin patches with rudder-agent

Added by Matthieu CERDA over 9 years ago. Updated over 9 years ago.

Status:
Released
Priority:
1
Assignee:
Jonathan CLARKE
Category:
System integration
Target version:
3.0.0~beta2
Pull Request:
https://github.com/Normation/rudder-p...
Severity:
UX impact:
User visibility:
Effort required:
Priority:
Name check:
Fix check:
Regression:

Description

Since we introduced a lot of changes recently, they are not in sync anymore...

$ patch -d ../SPECS --forward -p1 < patches/rudder-agent-thin/0002-rudder-agent-to-rudder-agent-thin-spec.patch
patching file rudder-agent.spec
Hunk #4 FAILED at 76.
Hunk #6 FAILED at 190.
Hunk #7 FAILED at 206.
Hunk #9 succeeded at 361 (offset 3 lines).
Hunk #10 succeeded at 383 (offset 3 lines).
Hunk #11 succeeded at 407 (offset 3 lines).
Hunk #12 succeeded at 428 (offset 3 lines).
Hunk #13 succeeded at 657 (offset 8 lines).
Hunk #14 succeeded at 679 (offset 8 lines).
Hunk #15 succeeded at 726 with fuzz 1 (offset 8 lines).
Hunk #16 succeeded at 763 (offset 11 lines).
3 out of 16 hunks FAILED -- saving rejects to file rudder-agent.spec.rej

Let's update this :)

Actions
Copy link

Also available in: Atom PDF