1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/51ffca8538ff/
changeset: 51ffca8538ff
user: inithello
date: 2012-11-27 19:53:17
summary: Fixed error when granting write access to a repository.
affected #: 1 file
diff -r 2aae11d62620b6c839b513d68a06d2cc57c5fa21 -r 51ffca8538ff769f54f379d6e070494fc2c14833 lib/galaxy/webapps/community/model/__init__.py
--- a/lib/galaxy/webapps/community/model/__init__.py
+++ b/lib/galaxy/webapps/community/model/__init__.py
@@ -143,7 +143,7 @@
if username not in allow_push:
allow_push.append( username )
allow_push = '%s\n' % ','.join( allow_push )
- repo = hg.repository( ui.ui(), path=self.repo_path )
+ repo = hg.repository( ui.ui(), path=self.repo_path( app ) )
# Why doesn't the following work?
#repo.ui.setconfig( 'web', 'allow_push', allow_push )
lines = repo.opener( 'hgrc', 'rb' ).readlines()
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/2aae11d62620/
changeset: 2aae11d62620
user: natefoo
date: 2012-11-27 19:50:54
summary: Split job limits on ' = ' rather than '='.
affected #: 1 file
diff -r 4a95ae9a26d96f0dc9a0fe3b083a2c7b99b0466b -r 2aae11d62620b6c839b513d68a06d2cc57c5fa21 lib/galaxy/config.py
--- a/lib/galaxy/config.py
+++ b/lib/galaxy/config.py
@@ -224,8 +224,8 @@
try:
job_limits = global_conf_parser.items( 'galaxy:job_limits' )
for k, v in job_limits:
- # ConfigParser considers the first colon to be the delimiter, undo this behavior
- more_k, v = v.split('=', 1)
+ # Since the URL contains a colon and possibly an equals sign, consider ' = ' the delimiter
+ more_k, v = v.split(' = ', 1)
k = '%s:%s' % (k, more_k.strip())
v = v.strip().rsplit(None, 1)
v[1] = int(v[1])
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/4a95ae9a26d9/
changeset: 4a95ae9a26d9
user: natefoo
date: 2012-11-27 18:18:08
summary: Handle invalid job ids in the drmaa runner.
affected #: 1 file
diff -r 9bf411ee2476c21c4c3fce6a5bbabf508f7505ff -r 4a95ae9a26d96f0dc9a0fe3b083a2c7b99b0466b lib/galaxy/jobs/runners/drmaa.py
--- a/lib/galaxy/jobs/runners/drmaa.py
+++ b/lib/galaxy/jobs/runners/drmaa.py
@@ -293,6 +293,7 @@
galaxy_job_id = drm_job_state.job_wrapper.job_id
old_state = drm_job_state.old_state
try:
+ assert job_id not in ( None, 'None' ), 'Invalid job id: %s' % job_id
state = self.ds.jobStatus( job_id )
# InternalException was reported to be necessary on some DRMs, but
# this could cause failures to be detected as completion! Please
@@ -308,7 +309,7 @@
continue
except Exception, e:
# so we don't kill the monitor thread
- log.exception("(%s/%s) Unable to check job status" % ( galaxy_job_id, job_id ) )
+ log.exception("(%s/%s) Unable to check job status: %s" % ( galaxy_job_id, job_id, str( e ) ) )
log.warning("(%s/%s) job will now be errored" % ( galaxy_job_id, job_id ) )
drm_job_state.fail_message = "Cluster could not complete job"
self.work_queue.put( ( 'fail', drm_job_state ) )
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/8143d7f7b944/
changeset: 8143d7f7b944
user: jgoecks
date: 2012-11-27 00:26:42
summary: Remove debugging statement.
affected #: 1 file
diff -r 1c5aa1094c417760f0c48225f5a3dd8b71245b0e -r 8143d7f7b94449889c1d590a3d72a3d20de291e3 templates/grid_base.mako
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -564,7 +564,6 @@
// HACK: use a simple string to separate the elements in the
// response: (1) table body; (2) number of pages in table; and (3) message.
var parsed_response_text = response_text.split("*****");
- console.log(parsed_response_text);
// Update grid body and footer.
$('#grid-table-body').html(parsed_response_text[0]);
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.