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 545e265af45d2ee31aca0ee98be3354ecfb652b1..798a1ccceb8a2c15bf936505b155445b87c3e098 100644 (file)
--- 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 01aed0eb589289c8220c61dfbc319ffab53962f1..fcb5d14797d9e37fd0952ed0e4d92dd0739773d7 100644 (file)
--- 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