| 1 |
On Fri, Oct 11, 2013 at 11:15 AM, Brian Dolbec <dolsen@g.o> wrote: |
| 2 |
> On Fri, 2013-10-11 at 10:38 -0700, Dylan Baker wrote: |
| 3 |
>> This allows catalyst to work regardless of whether a user prefers that |
| 4 |
>> usr/bin/python be python 2.x or 3.x. |
| 5 |
>> --- |
| 6 |
>> catalyst | 2 +- |
| 7 |
>> 1 file changed, 1 insertion(+), 1 deletion(-) |
| 8 |
>> |
| 9 |
>> diff --git a/catalyst b/catalyst |
| 10 |
>> index 4550d05..11560fb 100755 |
| 11 |
>> --- a/catalyst |
| 12 |
>> +++ b/catalyst |
| 13 |
>> @@ -1,4 +1,4 @@ |
| 14 |
>> -#!/usr/bin/python -OO |
| 15 |
>> +#!/usr/bin/python2 -OO |
| 16 |
>> |
| 17 |
>> # Maintained in full by: |
| 18 |
>> # Catalyst Team <catalyst@g.o> |
| 19 |
> |
| 20 |
> |
| 21 |
> I'll reply to all 4 patches from this one. |
| 22 |
> |
| 23 |
> This is not needed due to the way python apps are wrapped during |
| 24 |
> install. bin/catalyst is renamed to bin/catalyst-python2.x and a |
| 25 |
> python-exec script replaces the original bin/catalyst. |
| 26 |
|
| 27 |
What do we gain by doing this in the ebuild's src_install() over doing |
| 28 |
it in? Because... |
| 29 |
|
| 30 |
> This is only |
| 31 |
> good for running the code directly from the git checkout. |
| 32 |
|
| 33 |
actually seems useful. We've had clearly broken commits go upstream, |
| 34 |
and if the author had been able to test from a git checkout we |
| 35 |
probably could have avoided that. |
| 36 |
|
| 37 |
> Also, we plan |
| 38 |
> to make the code python-3 capable as soon as a few more main code |
| 39 |
> changes are done. |
| 40 |
|
| 41 |
This isn't a reason to not specify the correct version of python. |
| 42 |
|
| 43 |
> As for the other patches, that work is already done in my rewrite and |
| 44 |
> will be taking over the master branch soon. It is the 3.0 branch which |
| 45 |
> has been rebased to the rewrite-on-master branch. There are a couple |
| 46 |
> rebase errors to fix on it still. |
| 47 |
> |
| 48 |
> http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git |
| 49 |
|
| 50 |
Sounds like it shouldn't be any trouble to rebase on top of Dylan's |
| 51 |
patches, which are (pending the v2 of patch 2) read to be applied to |
| 52 |
master. |
| 53 |
|
| 54 |
What I mean is that I don't want to turn down contributions from new |
| 55 |
developers because there's a big backlog of work that hasn't gone |
| 56 |
upstream. |
Archives