Merge pull request #870 from jmchilton/fix_venv_None

Fix Planemo writing a file called gx_venv_None.
galaxyproject · Sep 14, 2018 · a9227cd · a9227cd
2 parents a42c4bf + 59dc943
commit a9227cd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/planemo/galaxy/run.py b/planemo/galaxy/run.py
@@ -53,7 +53,7 @@ def setup_venv(ctx, kwds):
 def locate_galaxy_virtualenv(ctx, kwds):
     if not kwds.get("no_cache_galaxy", False):
         workspace = ctx.workspace
-        galaxy_branch = kwds.get("galaxy_branch", "master")
+        galaxy_branch = kwds.get("galaxy_branch") or "master"
         shared_venv_path = os.path.join(workspace, "gx_venv")
         if galaxy_branch != "master":
             shared_venv_path = "%s_%s" % (shared_venv_path, galaxy_branch)