From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 12 Nov 2008 22:25:03 +0000 (-0700)
Subject: setup: remove pkg_resources.require() from create_node.py and add it to runner.py
X-Git-Url: https://git.rkrishnan.org/simplejson/encoder.py.html?a=commitdiff_plain;h=74ce1cdc0063421996828196451fd73da24959fa;p=tahoe-lafs%2Ftahoe-lafs.git

setup: remove pkg_resources.require() from create_node.py and add it to runner.py
Brian correctly points out that the latter is an entry point.
---

diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index 545e265a..798a1ccc 100644
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -1,8 +1,6 @@
 
 import os, sys
 import pkg_resources
-pkg_resources.require('allmydata-tahoe')
-pkg_resources.require('twisted')
 from twisted.python import usage
 from allmydata.scripts.common import BasedirMixin, NoDefaultBasedirMixin
 
diff --git a/src/allmydata/scripts/runner.py b/src/allmydata/scripts/runner.py
index 01aed0eb..fcb5d147 100644
--- a/src/allmydata/scripts/runner.py
+++ b/src/allmydata/scripts/runner.py
@@ -1,8 +1,12 @@
 
 import sys
 from cStringIO import StringIO
+
+import pkg_resources
+pkg_resources.require('twisted')
 from twisted.python import usage
 
+pkg_resources.require('allmydata-tahoe')
 from allmydata.scripts.common import BaseOptions
 import debug, create_node, startstop_node, cli, keygen