cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Nalley <da...@gnsa.us>
Subject Re: [Patch] fixing python directory license file and headers
Date Mon, 11 Jun 2012 00:10:25 GMT
On 06/07/2012 03:40 PM, Chip Childers wrote:
> On Thu, Jun 7, 2012 at 3:14 PM, David Nalley <david@gnsa.us> wrote:
>> Chip - - this looks good except that we don't need python/LICENSE -
>> we'll put a top level LICENSE and NOTICE file in the root of the repo.
>> Can you remove that and send the patch again. Thanks for stepping up!
>>
>> --David
>>
> 
> Resent.  Thanks!


Chip,

I finally had some time to try and apply this.
Both this and the original patch that you sent I had problems with -

Here's the response (line number varies in the patches, but otherwise
identical)

git am \[PATCH\]\ fixing\ python\ directory\ license\ file\ and\ headers.eml
Applying: fixing python directory license file and headers
fatal: corrupt patch at line 37
Patch failed at 0001 fixing python directory license file and headers
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


So I delved into it a bit and see multiple lines like this:

-# You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-# Unless required by applicable law or agreed to in writing, software

That particular line is 81 chars long, and I am guessing that your MUA
is reformatting it? If you ran git format-patch can you see if the patch
itself has this in it - and if so send the .patch file rather than using
git send-email?

--David

Mime
View raw message