Op 29 mei 2011, om 09:22 heeft Koen Kooi het volgende geschreven:
>
> Op 29 mei 2011, om 02:26 heeft Elizabeth Flanagan het volgende geschreven:
>
>>
>> This fixes two bugs. When populate_lic was hitting | it was going
>> into an infinite recursion of the node.
>>
>> Also, some LICENSE fields may start with "(". We want to avoid
>> invalid python syntax here, so we strip out the whitespace.
>>
>> Signed-off-by: Beth Flanagan <[email protected]>
>> ---
>> meta/classes/license.bbclass | 15 ++++++++-------
>> 1 files changed, 8 insertions(+), 7 deletions(-)
>
>
> This doesn't apply for me with git am:
>
> Applying: license.bbclass: Infinite recursion of or nodes
> error: patch failed: meta/classes/license.bbclass:22
> error: meta/classes/license.bbclass: patch does not apply
> Patch failed at 0001 license.bbclass: Infinite recursion of or nodes
> When you have resolved this problem run "git am --resolved".
>
> or plain patch:
>
> patching file meta/classes/license.bbclass
> Hunk #1 FAILED at 22.
> Hunk #2 FAILED at 77.
> Hunk #3 FAILED at 97.
> Hunk #4 FAILED at 106.
> Hunk #5 FAILED at 119.
> Hunk #6 FAILED at 130.
> Hunk #7 FAILED at 157.
koen@dominion:/OE/tentacle/sources/openembedded-core$ git cherry-pick
c45fef44e7b817a4dccd3953633ebcae71f286dc
Finished one cherry-pick.
[master 6d62574] license.bbclass: Infinite recursion of or nodes
1 files changed, 8 insertions(+), 7 deletions(-)
That worked :)
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
