Branch: refs/heads/release_17.09 Home: https://github.com/galaxyproject/galaxy Commit: 385aaf2bd7e2b1c79f4b21f0449aed98fc9d6446 https://github.com/galaxyproject/galaxy/commit/385aaf2bd7e2b1c79f4b21f0449ae... Author: mvdbeek <m.vandenbeek@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py Log Message: ----------- Fix exception in admin panel TypeError: Non-hexadecimal digit found File "galaxy/web/framework/middleware/sentry.py", line 40, in __call__ iterable = self.application(environ, start_response) File "/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/paste/recursive.py", line 85, in __call__ return self.application(environ, start_response) File "/bioinfo/guests/mvandenb/galaxy/.venv/local/lib/python2.7/site-packages/paste/httpexceptions.py", line 640, in __call__ return self.application(environ, start_response) File "galaxy/web/framework/base.py", line 136, in __call__ return self.handle_request(environ, start_response) File "galaxy/web/framework/base.py", line 215, in handle_request body = method(trans, **kwargs) File "galaxy/web/framework/decorators.py", line 98, in decorator return func(self, trans, *args, **kwargs) File "galaxy/webapps/galaxy/controllers/admin_toolshed.py", line 660, in manage_repositories return self.repository_installation_grid(trans, **kwd) File "galaxy/web/framework/helpers/grids.py", line 85, in __call__ query = self.build_initial_query(trans, **kwargs) File "tool_shed/galaxy_install/grids/admin_toolshed_grids.py", line 334, in build_initial_query clause_list.append(self.model_class.table.c.id == trans.security.decode_id(tool_shed_repository_id)) File "galaxy/web/security/__init__.py", line 107, in decode_id return int(id_cipher.decrypt(obj_id.decode('hex')).lstrip("!")) File "encodings/hex_codec.py", line 42, in hex_decode output = binascii.a2b_hex(input) This is due to `tool_shed_repository_ids` being a json dump of a list in certain consitions (noticed this after installing a new repository). Commit: a82d325d18375797ce8ab53366320f3c9a772ab7 https://github.com/galaxyproject/galaxy/commit/a82d325d18375797ce8ab53366320... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-11-28 (Tue, 28 Nov 2017) Changed paths: M lib/tool_shed/galaxy_install/grids/admin_toolshed_grids.py Log Message: ----------- Merge pull request #5079 from mvdbeek/admin_panel_exception_fix [17.09] Fix exception in admin panel Compare: https://github.com/galaxyproject/galaxy/compare/e903cb708e2f...a82d325d1837