[Freeipa-devel] [PATCH] 6 - Dogtag DRM -IPA plugin

Petr Viktorin pviktori at redhat.com
Wed May 28 13:53:01 UTC 2014


On 05/28/2014 08:48 AM, Fraser Tweedale wrote:
> On Tue, May 27, 2014 at 05:57:40PM -0400, Ade Lee wrote:
>> There have been a couple of changes in the Dogtag interface, that
>> require some changes in the IPA patches.  Also, I had to add back a
>> function in order to rebase to the latest IPA code.
>>
>> Most are the patches are as before, attached to this email by default.
>>
>> The latest Dogtag 10.2 build with the relevant changes needed to work
>> with these patches is at:
>> http://copr.fedoraproject.org/coprs/vakwetu/dogtag/
>>
>> Ade
>>
>
> ACK.
>
> ipa-server-install worked fine for me, and the formatting changes
> seem good.  Patch 0003 did not apply cleanly on master (due to minor
> conflict in 71c6d2f:installutils.py); an updated patch 0003 is
> attached.

Hello,
If you do a rebase, could you attach all the patches again?
I don't have the Git objects that result from the original patch, so 
`git am` fails on the later patches:

$ git am -3 *.patch
Applying: Add a DRM to IPA
Applying: Added ipa-drm-install
Applying: Fix various pep 8 issues and comments from review
Applying: Added nolog to pkispawn and some additional fixes from review.
Applying: Added dogtag plugin for DRM
Applying: set drm to not install by default with ipa-server-install
Applying: Allow ipa-replica-install to be used for installing replicas
error: invalid object 100755 0385a823baa971b0e08d1d93d7409b7a7716e33b 
for 'install/tools/ipa-replica-install'
fatal: git-write-tree: error building trees
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0007 Allow ipa-replica-install to be used for installing 
replicas
The copy of the patch that failed is found in:
    /home/pviktori/freeipa/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

-- 
Petr³




More information about the Freeipa-devel mailing list