[tor-commits] [tor/release-0.2.2] Simplest fix to bug2402: do not include SVN versions

[arma@xxxxxxxxxxxxxx]

commit a1073ee956021ead19d30c2151510dbaced416a8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jan 25 14:08:13 2011 -0500

    Simplest fix to bug2402: do not include SVN versions
    
    When we stopped using svn, 0.2.1.x lost the ability to notice its svn
    revision and report it in the version number.  However, it kept
    looking at the micro-revision.i file... so if you switched to master,
    built tor, then switched to 0.2.1.x, you'd get a micro-revision.i file
    from master reported as an SVN tag.  This patch takes out the "include
    the svn tag" logic entirely.
    
    Bugfix on 0.2.1.15-rc; fixes bug 2402.
---
 changes/bug2402 |    4 ++++
 src/or/config.c |   11 +----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/changes/bug2402 b/changes/bug2402
new file mode 100644
index 0000000..f16f677
--- /dev/null
+++ b/changes/bug2402
@@ -0,0 +1,4 @@
+  o Minor bugfixes (build)
+    - Do not include Git version tags as though they were SVN tags when
+      generating a tarball from inside a repository that has switched between
+      branches.  Bugfix on 0.2.1.15-rc; fixes bug 2402.
diff --git a/src/or/config.c b/src/or/config.c
index f8cfd29..c5d6540 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -827,16 +827,7 @@ static char *_version = NULL;
 const char *
 get_version(void)
 {
-  if (_version == NULL) {
-    if (strlen(tor_svn_revision)) {
-      size_t len = strlen(VERSION)+strlen(tor_svn_revision)+8;
-      _version = tor_malloc(len);
-      tor_snprintf(_version, len, "%s (r%s)", VERSION, tor_svn_revision);
-    } else {
-      _version = tor_strdup(VERSION);
-    }
-  }
-  return _version;
+  return VERSION;
 }
 
 /** Release additional memory allocated in options



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits