From 9dd8549018d758eccc9768afb4049de2945d2616 Mon Sep 17 00:00:00 2001 From: Steven Valdez Date: Fri, 26 Apr 2013 22:25:58 -0400 Subject: [PATCH] Updates to cherrypy init for engine --- code/invirt.fcgi | 6 +++++- debian/changelog | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/code/invirt.fcgi b/code/invirt.fcgi index 41d724a..7d6dc9c 100755 --- a/code/invirt.fcgi +++ b/code/invirt.fcgi @@ -64,7 +64,11 @@ if __name__ == "__main__": cherrypy.engine.start() cherrypy.engine.block() else: - cherrypy.engine.start(blocking=False) + try: + # Case that cherrypy < 3.1.0 + cherrypy.engine.start(blocking=False) + except TypeError: + cherrypy.engine.start() from flup.server.fcgi import WSGIServer server = WSGIServer(cherrypy.tree) server.run() diff --git a/debian/changelog b/debian/changelog index b37b766..69d5471 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,17 @@ invirt-web (0.1.31) unstable; urgency=low -- Peter A. Iannucci Mon, 20 May 2013 09:00:00 -0400 +invirt-web (0.1.31~dvorak424) precise; urgency=low + + * Fixing cherrypy initialization for different versions. + + -- Steven Valdez Fri, 26 Apr 2013 22:25:24 -0400 + +invirt-web (0.1.31~dvorak423) precise; urgency=low + + * Removing leftover svn symlink from apache2. + + -- Steven Valdez Sat, 20 Apr 2013 20:47:51 -0400 invirt-web (0.1.31~dvorak422) precise; urgency=low -- 1.7.9.5