Permalink
Browse files

work on path handling for irods

  • Loading branch information...
1 parent b1a286f commit 667f0b24aa70d1f8dfd10e4a7cbe81bd62794043 @drelu drelu committed Dec 14, 2012
Showing with 9 additions and 4 deletions.
  1. +1 −0 bigjob/bigjob_manager.py
  2. +2 −1 pilot/filemanagement/irods_adaptor.py
  3. +6 −3 scripts/create_python_dist.sh
View
1 bigjob/bigjob_manager.py
@@ -680,6 +680,7 @@ def __generate_bootstrap_script_from_binary(self, coordination_host, coordinatio
os.system("tar -xzf " + BOOTSTRAP_FILE);
os.system("ls -lta")
os.system(".bigjob/python/bin/python -c 'import bigjob; import bigjob.bigjob_agent; print bigjob.version; bigjob.bigjob_agent.bigjob_agent([\\"bigjob_agent.py\\", \\"%s\\", \\"%s\\", \\"%s\\"])'")
+
except:
print "BJ installation failed!";
""" % (coordination_host, coordination_namespace, external_coordination_namespace))
View
3 pilot/filemanagement/irods_adaptor.py
@@ -49,7 +49,8 @@ def __is_local(self):
env_var = match.group(1)
logger.debug("Found: " + env_var)
if os.environ.has_key(env_var):
- self.localpath=os.environ[env_var]
+ self.localpath = re.sub(r'/\$\{.*\}/', os.environ[env_var], self.localpath)
+ logger.debug("Expanding URL Path to: " + self.localpath)
return True
return False
View
9 scripts/create_python_dist.sh
@@ -1,14 +1,17 @@
#!/bin/bash
-PYTHONHOME=/home/luckow/sw
+PYTHONHOME=/home/luckow/sw/*
-mkdir -p .bigjob/python
-cp -r $PYTHONHOME .bigjob/python
+mkdir -p .bigjob/python/
+cp -r $PYTHONHOME .bigjob/python/
MACHINE=`uname -m`
KERNEL=`uname -s`
tar -czvf bigjob-${KERNEL}-${MACHINE}.tar.gz .bigjob
+s3cmd put bigjob-Linux-x86_64.tar.gz s3://bigjob/
+s3cmd setacl --acl-public -r s3://bigjob/
+
rm -rf .bigjob

0 comments on commit 667f0b2

Please sign in to comment.