webish: display tahoe import path on the welcome page, to help figure out where the...

diff --git a/src/allmydata/web/welcome.xhtml b/src/allmydata/web/welcome.xhtml
index 48dbf9aaedf6f9410581996809295ade7baf73bf..8bafa39f9bb4319f0748b6481a2c992252fa8f52 100644 (file)
--- a/src/allmydata/web/welcome.xhtml
+++ b/src/allmydata/web/welcome.xhtml
@@ -17,7 +17,8 @@ tool</a> may also be useful.</div>
 <h2>Grid Status</h2>
 
 <div>My nodeid: <span n:render="string" n:data="my_nodeid" /></div>
-<div>My version: <span n:render="string" n:data="version" /></div>
+<div>My versions: <span n:render="string" n:data="version" /></div>
+<div>Tahoe code imported from: <span n:render="string" n:data="import_path" /></div>
 
 <div>Introducer: <span n:render="string" n:data="introducer_furl" /></div>
 <div>Connected to introducer?: <span n:render="string" n:data="connected_to_introducer" /></div>

diff --git a/src/allmydata/webish.py b/src/allmydata/webish.py
index 31ef7b471eafbc9462aeee8e14993edbd8bc3f7d..d5de20ccfed0d0a9ff6b9d415c6fcd730bcbe9b8 100644 (file)
--- a/src/allmydata/webish.py
+++ b/src/allmydata/webish.py
@@ -11,6 +11,7 @@ from allmydata.util import fileutil, idlib
 import simplejson
 from allmydata.interfaces import IDownloadTarget, IDirectoryNode, IFileNode, \
      IMutableFileNode
+import allmydata # to display import path
 from allmydata import download
 from allmydata.upload import FileHandle, FileName
 from allmydata import provisioning
@@ -1311,6 +1312,8 @@ class Root(rend.Page):
 
     def data_version(self, ctx, data):
         return get_package_versions_string()
+    def data_import_path(self, ctx, data):
+        return str(allmydata)
 
     def data_my_nodeid(self, ctx, data):
         return idlib.nodeid_b2a(IClient(ctx).nodeid)