@@ -59,7 +59,14 @@ class server(object): self.assert_status('stopped') if not args: args = self.args - process = subprocess.Popen(args, env=self.env, **kwargs) + try: + process = subprocess.Popen(args, env=self.env, **kwargs) + except OSError, x: + if x.errno == 2: + raise DiscoError("%s not found. "\ + "Is it in your PATH?" % args[0]) + else: + raise if process.wait(): raise DiscoError("Failed to start %s" % self) yield '%s started' % self @@ -224,7 +231,13 @@ def main(): if not os.path.exists(DISCO_CONF): DISCO_CONF = "/etc/disco" - sys.path.extend([DISCO_PATH, sys.path.pop(0)]) + # disco.py and the disco package are ambiguous. Move the local directory + # to the end of the list, to make sure that the disco package is preferred + # over disco.py. + sys.path.append(sys.path.pop(0)) + # Prefer local Disco over system-wide installation + sys.path.insert(0, DISCO_PATH) + from disco.settings import DiscoSettings usage = """ bin/disco.py @@ -25,7 +25,7 @@ class DiscoSettings(dict): 'DISCO_ERLANG': "guess_erlang()", 'DISCO_HTTPD': "'lighttpd'", 'DISCO_WWW_ROOT': "os.path.join(DISCO_MASTER_HOME, 'www')", - 'PYTHONPATH': "'%s:%s' % (os.getenv('PYTHONPATH', ''), DISCO_PATH)", + 'PYTHONPATH': "DISCO_PATH", 'DISCO_SCHEDULER': "'fair'", 'DISCO_SCHEDULER_ALPHA': ".001", } pydisco/disco/settings.py 2f79c69879b4b5f565eb8023d680f91d6b787641 Ville Tuulos tuulos@dxfront.(none) http://github.com/tuulos/disco/commit/dc3a5e36b66f1346a216e33c43b19f60c6b074e6 dc3a5e36b66f1346a216e33c43b19f60c6b074e6 2009-09-09T16:44:10-07:00 2009-09-09T16:44:10-07:00 Fixed a PYTHONPATH issue in disco.py a636cf6cbdadc3546aaaf716a14f0be09172278d Ville Tuulos tuulos@dxfront.(none)