Merge pull request #2056 from cdonati/tornado-conflicts

Ensure system tornado package is not installed
AppScale · Jun 17, 2016 · ad42edf · ad42edf
2 parents cc3fba0 + 4a4f694
commit ad42edf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/debian/control.trusty b/debian/control.trusty
@@ -94,7 +94,8 @@ Conflicts: apache2.2-bin,
            apache2.2-common,
            apache2-utils,
            python-librabbitmq,
-           python-protobuf
+           python-protobuf,
+           python-tornado
 Description: An open-source framework for execution of GAE applications
  An open-source research framework for execution of
  Google AppEngine applications and investigation of

diff --git a/debian/control.wheezy b/debian/control.wheezy
@@ -86,7 +86,8 @@ Depends: appscale-tools,
 Conflicts: python-protobuf,
            apache2.2-common,
            apache2.2-bin,
-           apache2-utils
+           apache2-utils,
+           python-tornado
 Description: An open-source framework for execution of GAE applications
  An open-source research framework for execution of
  Google AppEngine applications and investigation of