[cig-commits] [commit] pluggable: MODEL can now point to a '.tgz' file. (cfc20f7)

[cig_noreply at geodynamics.org]

Repository : ssh://geoshell/specfem3d_globe

On branch  : pluggable
Link       : https://github.com/geodynamics/specfem3d_globe/compare/64e1b38f0c5ebb4056cce0b15d41c0b9f94ab6e5...099a4d330d5b173b21e51ad441f9f429e5d37842

>---------------------------------------------------------------

commit cfc20f734ce058cc50e428324d0271b5e13a3052
Author: Leif Strand <leif at geodynamics.org>
Date:   Fri Feb 27 02:05:50 2009 +0000

    MODEL can now point to a '.tgz' file.


>---------------------------------------------------------------

cfc20f734ce058cc50e428324d0271b5e13a3052
 prepare-model.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/prepare-model.py b/prepare-model.py
index 104cd14..3d509e9 100755
--- a/prepare-model.py
+++ b/prepare-model.py
@@ -4,7 +4,7 @@
 import os, sys
 
 
-class CopiedFromPortal:
+class MovedFromPortal:
 
     def __init__(self, model):
         self.model = model
@@ -109,17 +109,20 @@ class CopiedFromPortal:
 
 def prepareModel():
     import tarfile
+    from os.path import isdir
 
-    model = "model.tgz"
+    model = os.environ.get('MODEL')
+    assert model, "MODEL environment variable is not set"
     
-    modelDir = os.environ.get('MODEL')
-    assert modelDir, "MODEL environment variable is not set"
-    tgzOut = tarfile.open(model, 'w:gz')
-    tgzOut.dereference = True # follow symlinks
-    tgzOut.add(modelDir)
-    tgzOut.close()
+    if isdir(model):
+        modelDir = model
+        model = "model.tgz"
+        tgzOut = tarfile.open(model, 'w:gz')
+        tgzOut.dereference = True # follow symlinks
+        tgzOut.add(modelDir)
+        tgzOut.close()
 
-    CopiedFromPortal(model).prepareModel()
+    MovedFromPortal(model).prepareModel()
 
 
 try: