2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2a7b890c09c1/
Changeset: 2a7b890c09c1
Branch: next-stable
User: dannon
Date: 2014-05-29 23:23:51
Summary: Improve assertion logging for upload_store mismatch
Affected #: 1 file
diff -r b8fef1dfa8e8eb5afdeaa96236a0a9990f7c532b -r
2a7b890c09c1fb677378e099a5f0637c2036b310 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -498,7 +498,7 @@
# Check that the file is in the right location
local_filename = os.path.abspath( value['path'] )
assert local_filename.startswith( upload_store ), \
- "Filename provided by nginx is not in correct directory"
+ "Filename provided by nginx (%s) is not in correct directory
(%s)" % (local_filename, upload_store)
value = dict(
filename=value["name"],
local_filename=local_filename
https://bitbucket.org/galaxy/galaxy-central/commits/3409e283965f/
Changeset: 3409e283965f
User: dannon
Date: 2014-05-29 23:24:03
Summary: Merge.
Affected #: 1 file
diff -r 675be4213255a51c84ff52973bc199fa6d2152a1 -r
3409e283965f58ec4bf96594f980a8e6ee2cb058 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -498,7 +498,7 @@
# Check that the file is in the right location
local_filename = os.path.abspath( value['path'] )
assert local_filename.startswith( upload_store ), \
- "Filename provided by nginx is not in correct directory"
+ "Filename provided by nginx (%s) is not in correct directory
(%s)" % (local_filename, upload_store)
value = dict(
filename=value["name"],
local_filename=local_filename
Repository URL:
https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from
bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.