Merge.

[irc/quakenet/qwebirc.git] / bin / dependencies_b.py

diff --git a/bin/dependencies_b.py b/bin/dependencies_b.py
index b3b82b0b11b8521f884b8497837089614f3ccaaa..746860ae91ac9a40ba9ba65fab72c50fba3501ed 100644 (file)
--- a/bin/dependencies_b.py
+++ b/bin/dependencies_b.py
@@ -1,8 +1,9 @@
-# this is seperate to allow us to use python 2.5 syntax without\r
+# this is separate to allow us to use python 2.5 syntax without\r
 # the dependency checker breaking on earlier versions.\r
 \r
 import sys\r
 import subprocess\r
+import os\r
 \r
 def fail(*message):\r
   print >>sys.stderr, "\n".join(message)\r
@@ -13,9 +14,9 @@ def warn(*message):
 \r
 def check_dependencies():\r
   i = 0\r
-  \r
-  check_twisted()\r
+\r
   check_zope()\r
+  check_twisted()\r
   check_win32()\r
   i+=check_autobahn()\r
   i+=check_json()\r
@@ -126,10 +127,10 @@ def check_json():
 \r
 def check_autobahn():\r
   try:\r
-    import autobahn, autobahn.websocket\r
+    import autobahn, autobahn.twisted.websocket\r
     x = autobahn.version.split(".")\r
     if len(x) != 3:\r
-      raise ImportError("Unknown version: %s", autobahn.vesrion)\r
+      raise ImportError()\r
     if (int(x[1]) < 8) or (int(x[1]) == 8 and int(x[2]) < 14):\r
       raise ImportError()\r
     return 0\r