From 1aed9fcfa1c455380fffa142210fcea41fbb497e Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx <zooko@zooko.com> Date: Thu, 1 Jan 1970 17:50:05 -0700 Subject: [PATCH] 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. --- src/allmydata/scripts/create_node.py | 9 +++++++++ 1 file changed, 9 insertions(+) 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 -- 2.45.2