From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 2 Jan 1970 00:50:05 +0000 (-0700)
Subject: setup: the .tac files created by create_node.py call pkg_resources.require() so that... 
X-Git-Tag: allmydata-tahoe-1.3.0~438
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=1aed9fcfa1c455380fffa142210fcea41fbb497e;p=tahoe-lafs%2Ftahoe-lafs.git

setup: the .tac files created by create_node.py call pkg_resources.require() so that they can load tahoe and twisted packages which were installed with setuptools multi-version mode
Also the create_node.py script itself uses pkg_resources.require() for the same reason.
---

diff --git a/src/allmydata/scripts/create_node.py b/src/allmydata/scripts/create_node.py
index b1e15364..545e265a 100644
--- a/src/allmydata/scripts/create_node.py
+++ b/src/allmydata/scripts/create_node.py
@@ -1,5 +1,8 @@
 
 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
 
@@ -26,6 +29,9 @@ class CreateIntroducerOptions(NoDefaultBasedirMixin, usage.Options):
 client_tac = """
 # -*- python -*-
 
+import pkg_resources
+pkg_resources.require('allmydata-tahoe')
+pkg_resources.require('twisted')
 from allmydata import client
 from twisted.application import service
 
@@ -38,6 +44,9 @@ c.setServiceParent(application)
 introducer_tac = """
 # -*- python -*-
 
+import pkg_resources
+pkg_resources.require('allmydata-tahoe')
+pkg_resources.require('twisted')
 from allmydata import introducer
 from twisted.application import service