From 1d4ae84e5332fd9e099a5840a8dc19c3deefe29e Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Wed, 20 Apr 2011 20:24:57 +0200 Subject: [PATCH] Up-port changeset 5cf8f6da8743 (closes #11890) --- Python/sysmodule.c | 60 ++++------------------------------------------ 1 file changed, 4 insertions(+), 56 deletions(-) diff --git a/Python/sysmodule.c b/Python/sysmodule.c index f85cc55ad1..c688172dac 100644 --- a/Python/sysmodule.c +++ b/Python/sysmodule.c @@ -1065,8 +1065,6 @@ settrace() -- set the global debug tracing function\n\ /* end of sys_doc */ ; /* Subversion branch and revision management */ -static const char _patchlevel_revision[] = PY_PATCHLEVEL_REVISION; -static const char headurl[] = "$HeadURL$"; static int svn_initialized; static char patchlevel_revision[50]; /* Just the number */ static char branch[50]; @@ -1076,64 +1074,14 @@ static const char *svn_revision; static void svnversion_init(void) { - const char *python, *br_start, *br_end, *br_end2, *svnversion; - Py_ssize_t len; - int istag = 0; - if (svn_initialized) return; - python = strstr(headurl, "/python/"); - if (!python) { - strcpy(branch, "unknown branch"); - strcpy(shortbranch, "unknown"); - } - else { - br_start = python + 8; - br_end = strchr(br_start, '/'); - assert(br_end); - - /* Works even for trunk, - as we are in trunk/Python/sysmodule.c */ - br_end2 = strchr(br_end+1, '/'); - - istag = strncmp(br_start, "tags", 4) == 0; - if (strncmp(br_start, "trunk", 5) == 0) { - strcpy(branch, "trunk"); - strcpy(shortbranch, "trunk"); - } - else if (istag || strncmp(br_start, "branches", 8) == 0) { - len = br_end2 - br_start; - strncpy(branch, br_start, len); - branch[len] = '\0'; - - len = br_end2 - (br_end + 1); - strncpy(shortbranch, br_end + 1, len); - shortbranch[len] = '\0'; - } - else { - Py_FatalError("bad HeadURL"); - return; - } - } - - - svnversion = _Py_svnversion(); - if (strcmp(svnversion, "Unversioned directory") != 0 && strcmp(svnversion, "exported") != 0) - svn_revision = svnversion; - else if (istag) { - len = strlen(_patchlevel_revision); - assert(len >= 13); - assert(len < (sizeof(patchlevel_revision) + 13)); - strncpy(patchlevel_revision, _patchlevel_revision + 11, - len - 13); - patchlevel_revision[len - 13] = '\0'; - svn_revision = patchlevel_revision; - } - else - svn_revision = ""; - svn_initialized = 1; + *patchlevel_revision = '\0'; + strcpy(branch, ""); + strcpy(shortbranch, "unknown"); + svn_revision = ""; } /* Return svnversion output if available. -- 2.40.0