From 02c77929852d99ed837e0599140d2b3f40d89767 Mon Sep 17 00:00:00 2001 From: John Chilton Date: Wed, 6 Sep 2017 09:34:11 -0400 Subject: [PATCH] [16.01] Backport uwsgi fix from #2836. Now that newer releases require a library that the mere presence of breaks an older version of Galaxy, I think this will be encountered more during development. It is breaking Planemo's ability to switch between different versions of Galaxy. https://github.com/galaxyproject/galaxy/pull/2836 --- lib/galaxy/config.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py index 264a22e216b5..58f4addec10f 100644 --- a/lib/galaxy/config.py +++ b/lib/galaxy/config.py @@ -29,8 +29,10 @@ # uwsgi-managed process. try: import uwsgi - if uwsgi.numproc: + if hasattr(uwsgi, "numproc"): process_is_uwsgi = True + else: + process_is_uwsgi = False except ImportError: # This is not a uwsgi process, or something went horribly wrong. process_is_uwsgi = False