summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-12-15 15:44:16 -0500
committerBenjamin Peterson <benjamin@python.org>2011-12-15 15:44:16 -0500
commit57c9c7b755671b7d212ead8988c34d9cf0b11fb3 (patch)
tree0ea960c7c3fc21feb156415ba5ab37fa35d43872
parentb3132bd9a5485d73baa662eaf8bede06b433e342 (diff)
parent9c49036e70c19921da39ca3da8124e82d0a395d4 (diff)
downloadcpython-git-57c9c7b755671b7d212ead8988c34d9cf0b11fb3.tar.gz
merge heads
-rwxr-xr-xLib/platform.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/platform.py b/Lib/platform.py
index a14639e717..172722e41c 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -186,7 +186,7 @@ def libc_ver(executable=sys.executable,lib='',version='',
elif so:
if lib != 'glibc':
lib = 'libc'
- if soversion > version:
+ if soversion and soversion > version:
version = soversion
if threads and version[-len(threads):] != threads:
version = version + threads