1 |
Zac applied this patch. When I have time to merge the massive changes |
2 |
from yesterday in the portage trunk it will be in. Sorry for the wait! |
3 |
(And thanks Zac for applying the patch!) |
4 |
|
5 |
|
6 |
On 18-05-2007 23:05:32 +0200, Michael Haubenwallner wrote: |
7 |
> On Tue, 2007-05-15 at 21:38 +0200, Fabian Groffen wrote: |
8 |
> > Applied, thanks. I don't dare asking if it works. I hope it helps you |
9 |
> > a bit further though. ;) Will release snapshot later tonight in a new |
10 |
> > portage snapshot + bootstrap script, maybe that helps a bit too. |
11 |
> |
12 |
> Thank you! |
13 |
> |
14 |
> There's one more thing (besides others yet unknown) needed to "let |
15 |
> windows emerge": |
16 |
> |
17 |
> *) cPickle python module does not work on interix. |
18 |
> It builds and installs without errors, but lets python dump core if used |
19 |
> (import only works). |
20 |
> |
21 |
> But now, when cPickle.so is removed, portage does not consistently fall |
22 |
> back to pickle module everywhere. It is done in portage/__init__.py and |
23 |
> somewhere else, but not in portage/dbapi/vartree.py. |
24 |
> |
25 |
> So my first "emerge --oneshot --nodeps portage" succeeded on interix, |
26 |
> although this only works if there's nothing emerged before yet... |
27 |
> |
28 |
> /haubi/ |
29 |
|
30 |
> diff -ru prefix-portage-2.1.23.6381.orig/pym/portage/dbapi/vartree.py prefix-portage-2.1.23.6381/pym/portage/dbapi/vartree.py |
31 |
> --- prefix-portage-2.1.23.6381.orig/pym/portage/dbapi/vartree.py Tue May 8 09:57:58 2007 |
32 |
> +++ prefix-portage-2.1.23.6381/pym/portage/dbapi/vartree.py Tue May 8 11:39:31 2007 |
33 |
> @@ -20,7 +20,12 @@ |
34 |
> doebuild_environment, doebuild, env_update, dircache, \ |
35 |
> abssymlink, movefile, bsd_chflags |
36 |
> |
37 |
> -import os, sys, stat, cPickle, errno, commands, copy, time |
38 |
> +try: |
39 |
> + import cPickle |
40 |
> +except ImportError: |
41 |
> + import pickle as cPickle |
42 |
> + |
43 |
> +import os, sys, stat, errno, commands, copy, time |
44 |
> from itertools import izip |
45 |
> |
46 |
> class vardbapi(dbapi): |
47 |
|
48 |
|
49 |
-- |
50 |
Fabian Groffen |
51 |
Gentoo on a different level |
52 |
-- |
53 |
gentoo-alt@g.o mailing list |