[Freeipa-devel] [PATCH 53/53] ticket 2022 - modify codebase to utilize IPALogManager, obsoletes logging

Martin Kosek mkosek at redhat.com
Fri Nov 18 08:09:45 UTC 2011


On Thu, 2011-11-17 at 14:00 -0500, John Dennis wrote:
> On 11/17/2011 11:17 AM, John Dennis wrote:
> > On 11/16/2011 07:35 AM, Martin Kosek wrote:
> >> 1) Patch 53 will need rebasing
> >
> > O.K. will rebase.
> 
> O.K. I'm confused. This is a 3.0 feature and the patch is against 
> origin/master which is fully up to date.
> 

Hm, this does not work for me on the master branch:

$ git pull
Already up-to-date.

$ git apply ~/0052-ticket-2022-Add-log-manager-module.patch
/home/mkosek/0052-ticket-2022-Add-log-manager-module.patch:1766: new blank line at EOF.
+
warning: 1 line adds whitespace errors.

$ git apply ~/0053-ticket-2022-modify-codebase-to-utilize-IPALogManager.patch
error: patch failed: install/tools/ipa-server-install:510
error: install/tools/ipa-server-install: patch does not apply
error: patch failed: ipaserver/install/dsinstance.py:97
error: ipaserver/install/dsinstance.py: patch does not apply

Martin




More information about the Freeipa-devel mailing list