Project

General

Profile

Bug #7581

Updated by Jonathan CLARKE almost 9 years ago

Some patches cannot be applied anymore: 

 In 3.0: 

 <pre> 
 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 
 </pre> 

 3.0  

 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: 

 <pre> 
 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 
 </pre> 

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

Back