[SSSD] [PATCHES] Merging INI snippets

Dmitri Pal dpal at redhat.com
Wed Dec 3 22:58:46 UTC 2014


On 12/03/2014 08:19 AM, Jakub Hrozek wrote:
> On Wed, Dec 03, 2014 at 10:23:15AM +0100, Lukas Slebodnik wrote:
>> On (02/12/14 20:00), Jakub Hrozek wrote:
>>> On Tue, Dec 02, 2014 at 04:33:28PM +0100, Lukas Slebodnik wrote:
>>>> On (29/11/14 01:03), Dmitri Pal wrote:
>>>>>> On (19/11/14 18:02), Lukas Slebodnik wrote:
>>>>>> Firstly, I would like to appologize for late review.
>>>>> Thanks for review!
>>>>> Not a problem at all.
>>>>> It is not a high priority.
>>>>>
>>>> //snip
>>>>
>>>>> New set is attached.
>>>>>
>>>> all issues were fixed.
>>>> There aren't any warnings from static analysers of c compiler.
>>>>
>>>> ACK
>>>>
>>>> LS
>>> I must be missing some patches in between b/c I can't apply the last
>>> one:
>>>
>>> [jhrozek at hendrix] ding-libs $ [(master)] git fetch origin
>>> [jhrozek at hendrix] ding-libs $ [(master)] git reset --hard origin/master
>>> HEAD is now at ab73013 SPEC: Do not include compiled files into package libdhash-devel
>>> [jhrozek at hendrix] ding-libs $ [(master)] lsp
>>> -rw-------. 1 jhrozek jhrozek   729 Dec  2 16:40 0001-RA-Print-info-when-array-is-empty.patch
>>> -rw-------. 1 jhrozek jhrozek   881 Dec  2 16:40 0002-INI-Declaring-new-internal-access-check-function.patch
>>> -rw-------. 1 jhrozek jhrozek  4166 Dec  2 16:40 0003-INI-Refactored-access-control-check.patch
>>> -rw-------. 1 jhrozek jhrozek 42030 Dec  2 16:40 0004-INI-New-function-to-merge-snippets.patch
>>> -rw-------. 1 jhrozek jhrozek  7683 Dec  2 16:40 0005-INI-Test-file-for-unit-test.patch
>>> -rw-------. 1 jhrozek jhrozek  7855 Dec  2 16:40 0006-INI-Make-the-merge-function-build.patch
>>> [jhrozek at hendrix] ding-libs $ [(master)] git am 0001-RA-Print-info-when-array-is-empty.patch 0002-INI-Declaring-new-internal-access-check-function.patch 0003-INI-Refactored-access-control-check.patch 0004-INI-New-function-to-merge-snippets.patch 0005-INI-Test-file-for-unit-test.patch
>>> Applying: Print info when array is empty
>>> Applying: Declaring new internal access check function
>>> Applying: Refactored access control check
>>> Applying: New function to merge snippets
>>> /home/remote/jhrozek/devel/ding-libs/.git/rebase-apply/patch:986: new blank line at EOF.
>>> +
>>> warning: 1 line adds whitespace errors.
>>> Applying: Test file for unit test
>>> [jhrozek at hendrix] ding-libs $ [(master)] git am 0006-INI-Make-the-merge-function-build.patch
>>> Applying: Make the merge function build
>>> /home/remote/jhrozek/devel/ding-libs/.git/rebase-apply/patch:125: trailing whitespace.
>>> * Function merges the main configuration file
>>> /home/remote/jhrozek/devel/ding-libs/.git/rebase-apply/patch:126: trailing whitespace.
>>> * with the configuration file snippets
>>> /home/remote/jhrozek/devel/ding-libs/.git/rebase-apply/patch:144: trailing whitespace.
>>> *                              holds criteria for the
>>> error: patch failed: Makefile.am:255
>>> error: Makefile.am: patch does not apply
>>> /home/remote/jhrozek/devel/ding-libs/.git/rebase-apply/patch:214: new blank line at EOF.
>>> +
>>> Patch failed at 0001 Make the merge function build
>>> The copy of the patch that failed is found in:
>>>    /home/remote/jhrozek/devel/ding-libs/.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".
>> I had the same problem with "git am" but i thought the problem is in the latest
>> version of git. But applying patch with simple old way "patch -p1" works well.
> OK, I also fixed the author mail (dpal at csb -> dpal at redhat.com) and added
> the reviewed-by tags before pushing:
>      9044d853a4a6c7cf0387d07b1a4c333adc07de17
>      b9104ae94e9f839d263acaef5296b8676734e855
>      d9df58eb9be0264ee4a9e864391df2d60f33f1b5
>      50abe3828ab2139c4e79d96d1ccf2b76c820cedb
>      0c7250402e027cd325af3e06b15b365bffb19688
>      04d88a875e3ac5f1c707d09cc9d5cb7ebf827913
> _______________________________________________
> sssd-devel mailing list
> sssd-devel at lists.fedorahosted.org
> https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
Thanks!


-- 
Thank you,
Dmitri Pal

Sr. Engineering Manager IdM portfolio
Red Hat, Inc.




More information about the sssd-devel mailing list