From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Fri, 13 Feb 2009 05:37:38 +0000 (-0700)
Subject: setup: make the "full version string" be "allmydata-tahoe/1.3.0" instead of "allmydat... 
X-Git-Tag: allmydata-tahoe-1.3.0~10
X-Git-Url: https://git.rkrishnan.org/pf/content/%22news.html/somewhere?a=commitdiff_plain;h=14d23d99a5d8f15a71ac09adc37bc4377dced55a;p=tahoe-lafs%2Ftahoe-lafs.git

setup: make the "full version string" be "allmydata-tahoe/1.3.0" instead of "allmydata-tahoe-1.3.0" and the UserAgent string of the cli be "allmydata-tahoe/1.3.0 (tahoe-client)"
This is webbish.  Thanks to kpreid for suggesting it.
---

diff --git a/src/allmydata/__init__.py b/src/allmydata/__init__.py
index dacb8c6a..f86e2703 100644
--- 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 0c7680e2..dda3a920 100644
--- 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()