From 74ce1cdc0063421996828196451fd73da24959fa Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Wed, 12 Nov 2008 15:25:03 -0700 Subject: [PATCH] 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. --- src/allmydata/scripts/create_node.py | 2 -- src/allmydata/scripts/runner.py | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) 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 -- 2.45.2