Bug #6076: Rudder Debian 8 support patches conflict with rudder-agent-thin packages - Rudder - Issue Tracker

Actions

Copy link

Bug #6076

closed

Rudder Debian 8 support patches conflict with rudder-agent-thin packages

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

Status:

Released

Priority:

Assignee:

Benoît PECCATTE

Category:

System integration

Target version:

3.0.0

Pull Request:

https://github.com/Normation/rudder-p...

Severity:

UX impact:

User visibility:

Effort required:

Priority:

Name check:

Fix check:

Regression:

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Subject changed from Rudder Debian to Rudder Debian 8 support patches conflict with rudder-agent-thin packages
Category set to System integration
Status changed from New to 8
Assignee set to Matthieu CERDA
Priority changed from N/A to 2
Target version set to 3.0.0

During rudder-agent-thin build, you get:

14:50:20 ++ patch -p0
14:50:20 patching file debian/control
14:50:20 Hunk #1 FAILED at 2.
14:50:20 1 out of 1 hunk FAILED -- saving rejects to file debian/control.rej
14:50:20 patching file debian/dirs
14:50:20 patching file debian/postinst
14:50:20 patching file debian/rules
14:50:21 Hunk #1 FAILED at 13.
14:50:21 Hunk #2 succeeded at 53 (offset -2 lines).
14:50:21 Hunk #3 succeeded at 86 (offset -3 lines).
14:50:21 Hunk #4 succeeded at 98 (offset -5 lines).
14:50:21 1 out of 4 hunks FAILED -- saving rejects to file debian/rules.rej

We can:

Stop building rudder-agent-thin on Debian 8 <= stupid idea :)
Use a different set of patches for Debian 8 <= increasing the complexity, stupid too (patching something already patched ? that's 2 SPOFs for the price of one)
Stop applying a specific patch (Use the system LMDB) on Debian 8 <= Looks good to me, the lmdb version in Debian 8 is already quite old...

What do ? [3] >

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Status changed from 8 to Discussion
Assignee deleted (~~Matthieu CERDA~~)

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Status changed from Discussion to In progress
Assignee set to Matthieu CERDA

As peck suggested, folded Depends: fields in debian/control files may be a solution, to prevent patch from choking on a single line with unexpected contents.

Build-depends: bla, bli, blu

Becomes:

Build-depends: bla,
               bli,
               blu

and all goes smooth :)

Testing this.

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Status changed from In progress to Pending technical review
Assignee changed from Matthieu CERDA to Benoît PECCATTE
% Done changed from 0 to 100
Pull Request set to https://github.com/Normation/rudder-packages/pull/578

PR is radis: https://github.com/Normation/rudder-packages/pull/578

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Also, I added a comment in debian/rules to make patch happy due to LMDB's statement presence (the comment acts as a padding space that patch can hold on to)

Actions

Copy link

Updated by Matthieu CERDA over 9 years ago

Actually, changed the PR to just remove the Debian 8 specific patch altogether, as suggested in the original suggestions, after a discussion with jon.

Actions

Copy link