[SSSD] [PATCHES] Merging INI snippets

Lukas Slebodnik lslebodn at redhat.com
Thu Oct 9 07:04:54 UTC 2014


On (29/09/14 07:45), Dmitri Pal wrote:
>On 09/10/2014 11:31 PM, Dmitri Pal wrote:
>>Hello,
>>
>>Extensive travel in recent months allowed me to finish this code.
>>
>>Here is the updated design:
>>https://fedorahosted.org/sssd/wiki/DesignDocs/ding-libs/INIConfigMerge
>>
>>Patches:
>>0001 - Fix in case the Ref array is empty and we need to print/debug it
>>0002 - Declaration of the new function to do access checks
>>0003 - Big patch with core functionality
>>0004 - Updated access check code to use new internal access control
>>function
>>0005 - File with expected output for unit test validation
>>0006 - Makefile and related changes to start building new code
>
>I am attaching a new patch on top of the other patches.
>It can be squashed with patch 3 after review.
>It improves sorting and scanning. See patch comment.
>
>
>>
>>No rush, take your time. :-)
>>
>>
>>
I forgot to write most important info in my previous mail.
The augment unit test failed on my machine.

sh-4.3$ cat ./ini_augment_ut.log 
rm: cannot remove ‘../ini/ini.d/*~’: No such file or directory
Files ./merge.validator.in and ./merge.validator.out differ
Failed to run diff command 256 1.
Failed with error -1!
sh-4.3$ 
sh-4.3$ diff ./merge.validator.in ./merge.validator.out
 3,4d2
 < File new_line.conf did not match provided patterns. Skipping.
 < File real32be.conf did not match provided patterns. Skipping.
 6c4
 < File real16be.conf did not match provided patterns. Skipping.
 ---
 > File real32be.conf did not match provided patterns. Skipping.
 7a6,7
 > File real16be.conf did not match provided patterns. Skipping.
 > File new_line.conf did not match provided patterns. Skipping.

Order of lines is different.

LS



More information about the sssd-devel mailing list