From: david-sarah Date: Fri, 29 Oct 2010 23:53:28 +0000 (-0700) Subject: scripts/runner.py: remove pkg_resources.require() calls. These are at best redundant... X-Git-Tag: trac-4800~20 X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=2a8f700026a207d9fc0a6fd0b956ed3c80843b8b;p=tahoe-lafs%2Ftahoe-lafs.git scripts/runner.py: remove pkg_resources.require() calls. These are at best redundant because we have already called _auto_deps.require_auto_deps() (from allmydata.__init__) at that point, and they are causing failure of the test-from-prefixdir step on some buildslaves. refs #1190 --- diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py index 4a81b06d..c3a2e448 100644 --- a/src/allmydata/scripts/runner.py +++ b/src/allmydata/scripts/runner.py @@ -2,12 +2,9 @@ import sys from cStringIO import StringIO -import pkg_resources -pkg_resources.require('twisted') from twisted.python import usage import allmydata -pkg_resources.require(allmydata.__appname__) from allmydata.scripts.common import BaseOptions from allmydata.scripts import debug, create_node, startstop_node, cli, keygen, stats_gatherer from allmydata.util.encodingutil import quote_output, get_argv_encoding