setup: make the "full version string" be "allmydata-tahoe/1.3.0" instead of "allmydat...

This is webbish.  Thanks to kpreid for suggesting it.

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index dacb8c6a19d827ddfdfd916bb76c74909e46bcf4..f86e2703fa384f5d335baaa73f243738b091c565 100644 (file)
--- a/src/allmydata/__init__.py
+++ b/src/allmydata/__init__.py
@@ -25,7 +25,7 @@ except ImportError:
 # __full_version__ is the one that you ought to use when identifying yourself in the
 # "application" part of the Tahoe versioning scheme:
 # http://allmydata.org/trac/tahoe/wiki/Versioning
-__full_version__ = __appname__ + '-' + str(__version__)
+__full_version__ = __appname__ + '/' + str(__version__)
 
 hush_pyflakes = __version__
 del hush_pyflakes

diff --git a/src/allmydata/scripts/common_http.py b/src/allmydata/scripts/common_http.py
index 0c7680e2a464ac0addaf71aba9557ccee5c5c4d8..dda3a9208a3efb2a7e7f50119c3a89a09b77a712 100644 (file)
--- a/src/allmydata/scripts/common_http.py
+++ b/src/allmydata/scripts/common_http.py
@@ -44,7 +44,7 @@ def do_http(method, url, body=""):
         raise ValueError("unknown scheme '%s', need http or https" % scheme)
     c.putrequest(method, path)
     c.putheader("Hostname", host)
-    c.putheader("User-Agent", "tahoe_cli/%s" % allmydata.__full_version__)
+    c.putheader("User-Agent", allmydata.__full_version__ + " (tahoe-client)")
     c.putheader("Connection", "close")
 
     old = body.tell()