| 1 |
jlec 10/02/10 11:22:35 |
| 2 |
|
| 3 |
Added: 1.2.2-data-path.patch |
| 4 |
Log: |
| 5 |
Fixing PYMOL_DATA again per 304259 |
| 6 |
(Portage version: 2.2_rc62/cvs/Linux i686) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 sci-chemistry/pymol/files/1.2.2-data-path.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.2-data-path.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-chemistry/pymol/files/1.2.2-data-path.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: 1.2.2-data-path.patch |
| 15 |
=================================================================== |
| 16 |
Index: modules/pymol/importing.py |
| 17 |
=================================================================== |
| 18 |
--- modules/pymol/importing.py (revision 3889) |
| 19 |
+++ modules/pymol/importing.py (working copy) |
| 20 |
@@ -191,7 +191,7 @@ |
| 21 |
''' |
| 22 |
r = DEFAULT_ERROR |
| 23 |
|
| 24 |
- tables = { 'cmyk' : "$PYMOL_PATH/data/pymol/cmyk.png", |
| 25 |
+ tables = { 'cmyk' : "$PYMOL_DATA/pymol/cmyk.png", |
| 26 |
'pymol' : 'pymol', |
| 27 |
'rgb' : 'rgb', |
| 28 |
'greyscale': 'greyscale' } |
| 29 |
Index: modules/pymol/wizard/mutagenesis.py |
| 30 |
=================================================================== |
| 31 |
--- modules/pymol/wizard/mutagenesis.py (revision 3889) |
| 32 |
+++ modules/pymol/wizard/mutagenesis.py (working copy) |
| 33 |
@@ -53,8 +53,8 @@ |
| 34 |
|
| 35 |
self.dep = default_dep |
| 36 |
|
| 37 |
- self.ind_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ |
| 38 |
- "/data/chempy/sidechains/sc_bb_ind.pkl") |
| 39 |
+ self.ind_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+ |
| 40 |
+ "/chempy/sidechains/sc_bb_ind.pkl") |
| 41 |
self.load_library() |
| 42 |
self.status = 0 # 0 no selection, 1 mutagenizing |
| 43 |
self.bump_check = 1 |
| 44 |
@@ -218,8 +218,8 @@ |
| 45 |
def load_library(self): |
| 46 |
if self.dep == 'dep': |
| 47 |
if not hasattr(self,'dep_library'): |
| 48 |
- self.dep_library = io.pkl.fromFile(os.environ['PYMOL_PATH']+ |
| 49 |
- "/data/chempy/sidechains/sc_bb_dep.pkl") |
| 50 |
+ self.dep_library = io.pkl.fromFile(os.environ['PYMOL_DATA']+ |
| 51 |
+ "/chempy/sidechains/sc_bb_dep.pkl") |
| 52 |
|
| 53 |
def set_mode(self,mode): |
| 54 |
cmd=self.cmd |
| 55 |
Index: modules/pymol/commanding.py |
| 56 |
=================================================================== |
| 57 |
--- modules/pymol/commanding.py (revision 3889) |
| 58 |
+++ modules/pymol/commanding.py (working copy) |
| 59 |
@@ -219,11 +219,11 @@ |
| 60 |
_self.unlock(0,_self) |
| 61 |
r = DEFAULT_SUCCESS |
| 62 |
if show_splash==1: # generic / open-source |
| 63 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/splash.png") |
| 64 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/splash.png") |
| 65 |
elif show_splash==2: # evaluation builds |
| 66 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/epymol.png") |
| 67 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/epymol.png") |
| 68 |
else: # incentive builds |
| 69 |
- png_path = _self.exp_path("$PYMOL_PATH/data/pymol/ipymol.png") |
| 70 |
+ png_path = _self.exp_path("$PYMOL_DATA/pymol/ipymol.png") |
| 71 |
if os.path.exists(png_path): |
| 72 |
_self.do("_ cmd.load_png('%s',0,quiet=1)"%png_path) |
| 73 |
else: |
| 74 |
Index: modules/chempy/tinker/__init__.py |
| 75 |
=================================================================== |
| 76 |
--- modules/chempy/tinker/__init__.py (revision 3889) |
| 77 |
+++ modules/chempy/tinker/__init__.py (working copy) |
| 78 |
@@ -145,9 +145,9 @@ |
| 79 |
bin_path = '' |
| 80 |
params_path = '' |
| 81 |
|
| 82 |
-if os.environ.has_key('PYMOL_PATH'): |
| 83 |
- pymol_path = os.environ['PYMOL_PATH'] |
| 84 |
- test_path = pymol_path + '/data/chempy/tinker/' |
| 85 |
+if os.environ.has_key('PYMOL_DATA'): |
| 86 |
+ pymol_path = os.environ['PYMOL_DATA'] |
| 87 |
+ test_path = pymol_path + '/chempy/tinker/' |
| 88 |
if os.path.exists(test_path): |
| 89 |
params_path = test_path |
Archives