aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/scripts/install.py
diff options
context:
space:
mode:
authorMcCabe Maxsted2009-09-04 09:31:06 -0700
committerMcCabe Maxsted2009-09-04 09:31:06 -0700
commit7529497350ce7205d516ed351a054d2b0a0f4f4f (patch)
treed1467365d5fb4c7fcf2c8b9c9b6b578cd49f6da4 /linden/scripts/install.py
parentFixed CMake not finding GLib on windows (diff)
parentBackported 1.23 fix for animation joint assertion crash. (diff)
downloadmeta-impy-7529497350ce7205d516ed351a054d2b0a0f4f4f.zip
meta-impy-7529497350ce7205d516ed351a054d2b0a0f4f4f.tar.gz
meta-impy-7529497350ce7205d516ed351a054d2b0a0f4f4f.tar.bz2
meta-impy-7529497350ce7205d516ed351a054d2b0a0f4f4f.tar.xz
Merged in jacek/next
Diffstat (limited to 'linden/scripts/install.py')
-rwxr-xr-xlinden/scripts/install.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/linden/scripts/install.py b/linden/scripts/install.py
index f886a6e..3843c83 100755
--- a/linden/scripts/install.py
+++ b/linden/scripts/install.py
@@ -34,7 +34,7 @@ $/LicenseInfo$
34""" 34"""
35 35
36import copy 36import copy
37import md5 37from hashlib import md5
38import optparse 38import optparse
39import os 39import os
40import platform 40import platform
@@ -46,8 +46,6 @@ import tempfile
46import urllib2 46import urllib2
47import urlparse 47import urlparse
48 48
49from sets import Set as set, ImmutableSet as frozenset
50
51# Locate -our- python library relative to our install location. 49# Locate -our- python library relative to our install location.
52from os.path import realpath, dirname, join 50from os.path import realpath, dirname, join
53 51
@@ -76,7 +74,7 @@ class InstallFile(object):
76 return "ifile{%s:%s}" % (self.pkgname, self.url) 74 return "ifile{%s:%s}" % (self.pkgname, self.url)
77 75
78 def _is_md5sum_match(self): 76 def _is_md5sum_match(self):
79 hasher = md5.new(file(self.filename, 'rb').read()) 77 hasher = md5(file(self.filename, 'rb').read())
80 if hasher.hexdigest() == self.md5sum: 78 if hasher.hexdigest() == self.md5sum:
81 return True 79 return True
82 return False 80 return False