Project

General

Profile

Actions

Bug #7581

closed

Bug #7556: Some patches silently fail to apply

Remove unapplying patches

Added by Vincent MEMBRÉ almost 9 years ago. Updated almost 9 years ago.

Status:
Released
Priority:
1 (highest)
Category:
Packaging
Target version:
Severity:
UX impact:
User visibility:
Effort required:
Priority:
Name check:
Fix check:
Regression:

Description

Some patches cannot be applied anymore:

In 3.0:

Applying patches/cfengine/0018-do-not-remove-cflags-when-compiling.patch...
patching file configure.ac
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file configure.ac.rej

commit fdc600e1f3c2ffc109efd980b2a83b45950a774c in cfengine remove the line of patch patches/cfengine/0018-do-not-remove-cflags-when-compiling.patch

This has apparently already been fixed in 3.6.3 (CFEngine version we use in Rudder 3.0) so is no longer necessary.

Also:

Applying patches/cfengine/0017-define-classes-when-package-is-up-to-date.patch...
patching file cf-agent/verify_packages.c
Hunk #1 succeeded at 1692 (offset 7 lines).

[...]

Applying patches/cfengine/07-define-classes-when-package-is-up-to-date.patch...
patching file cf-agent/verify_packages.c
Reversed (or previously applied) patch detected!  Assume -R? [n] 
Apply anyway? [n] 
Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file cf-agent/verify_packages.c.rej

This is a duplicate patch from #7002 and #6996.

Actions

Also available in: Atom PDF