aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/scripts
diff options
context:
space:
mode:
authorDavid Walter Seikel2012-02-20 22:10:26 +1000
committerDavid Walter Seikel2012-02-20 22:10:26 +1000
commitca7fd07f6600f73bd2050c1499e379f7d5038fa9 (patch)
tree310d5ab5e3f9d4164b9220a152618bb2ed2162ba /linden/scripts
parentSupport the new WindlightReset message from OpenSim for resetting Windlight p... (diff)
parentAdding my linux build scripts. Makes it easy to build under 32 and 64 bit li... (diff)
downloadmeta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.zip
meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.gz
meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.bz2
meta-impy-ca7fd07f6600f73bd2050c1499e379f7d5038fa9.tar.xz
Merge branch 'next' of git://github.com/imprudence/imprudence into next
Conflicts: linden/indra/newview/installers/windows/meta-impy_installer_template.iss Branding conflict, fixed. linden/indra/newview/llviewerwindow.cpp Already had this change, but merged the minor difference.
Diffstat (limited to 'linden/scripts')
-rwxr-xr-xlinden/scripts/install.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index c69644b..a7c0a48 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -36,6 +36,7 @@ $/LicenseInfo$
36import sys 36import sys
37import os.path 37import os.path
38import re 38import re
39import string
39 40
40# Look for indra/lib/python in all possible parent directories ... 41# Look for indra/lib/python in all possible parent directories ...
41# This is an improvement over the setup-path.py method used previously: 42# This is an improvement over the setup-path.py method used previously:
@@ -106,7 +107,7 @@ class InstallFile(object):
106 107
107 def _is_md5sum_match(self): 108 def _is_md5sum_match(self):
108 hasher = md5(file(self.filename, 'rb').read()) 109 hasher = md5(file(self.filename, 'rb').read())
109 if hasher.hexdigest() == self.md5sum: 110 if string.lower(hasher.hexdigest()) == string.lower(self.md5sum):
110 return True 111 return True
111 return False 112 return False
112 113