Skip to content

Commit

Permalink
Merge pull request #76 from broadinstitute/ccle_portal_hotfix
Browse files Browse the repository at this point in the history
v0.16.10: hotfix for robust deployment on Google AppEngine
  • Loading branch information
noblem authored Feb 9, 2018
2 parents 72b9708 + 95b610a commit 0a8581d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
Change Log for FISSFC: the (Fi)recloud (S)ervice (S)elector
=======================================================================
Terms used below: HL = high level interface, LL = low level interface
v0.16.9 - Hotfix; modified how subprocess.call() is utilized to avoid
problems on Google AppEngine, where it is prohibited
v0.16.8 - Hotfix; entity_import corrected to only strip newline characters.

v0.16.7 - Enabled LL and HL access to the linkExistingEntities field of the
Expand Down
6 changes: 3 additions & 3 deletions firecloud/fccore.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import tempfile
import shutil
from collections import Iterable
from subprocess import call
import subprocess
from io import IOBase
from firecloud import __about__
from google.auth import environment_vars
Expand Down Expand Up @@ -193,7 +193,7 @@ def edit_text(text=None):
if text:
tf.write(text)
tf.flush()
call([__EDITOR__, tf.name])
subprocess.call([__EDITOR__, tf.name])
with open(tf.name, 'r') as newfile:
text = newfile.read()
tf.close()
Expand All @@ -211,7 +211,7 @@ def edit_file(name, backup=None):
shutil.copy2(name, backup)
# Record time of last modification: tolm
previous_tolm = os.stat(name).st_mtime
call([__EDITOR__, name])
subprocess.call([__EDITOR__, name])
current_tolm = os.stat(name).st_mtime
return current_tolm != previous_tolm

Expand Down

0 comments on commit 0a8581d

Please sign in to comment.