particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

try again just call md5_constructor

Browse source
This commit is contained in:
Dennis Gilmore 2009-02-16 13:41:36 -06:00
parent 6b4005f83a
commit 4e2a652dff
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
builder/kojid
View file

@ -245,7 +245,7 @@ def incrementalUpload(fname, fd, path, retries=5, logger=None):
break
data = base64.encodestring(contents)
digest = md5_constructor.new(contents).hexdigest()
digest = md5_constructor(contents).hexdigest()
del contents
tries = 0

2
cli/koji
View file

@ -1173,7 +1173,7 @@ def handle_import_sig(options, session, args):
previous = session.queryRPMSigs(rpm_id=rinfo['id'], sigkey=sigkey)
assert len(previous) <= 1
if previous:
sighash = md5_constructor.new(sighdr).hexdigest()
sighash = md5_constructor(sighdr).hexdigest()
if previous[0]['sighash'] == sighash:
print _("Signature already imported: %s") % path
continue

6
hub/kojihub.py
View file

@ -3456,7 +3456,7 @@ def add_rpm_sig(an_rpm, sighdr):
#we use the sigkey='' to represent unsigned in the db (so that uniqueness works)
else:
sigkey = koji.hex_string(sigkey[13:17])
sighash = md5_constructor.new(sighdr).hexdigest()
sighash = md5_constructor(sighdr).hexdigest()
rpm_id = rinfo['id']
# - db entry
q = """SELECT sighash FROM rpmsigs WHERE rpm_id=%(rpm_id)i AND sigkey=%(sigkey)s"""
@ -4702,7 +4702,7 @@ class RootExports(object):
if size is not None:
if size != len(contents): return False
if md5sum is not None:
if md5sum != md5_constructor.new(contents).hexdigest():
if md5sum != md5_constructor(contents).hexdigest():
return False
uploadpath = koji.pathinfo.work()
#XXX - have an incoming dir and move after upload complete
@ -4762,7 +4762,7 @@ class RootExports(object):
fcntl.lockf(fd, fcntl.LOCK_UN)
if md5sum is not None:
#check final md5sum
sum = md5_constructor.new()
sum = md5_constructor()
fcntl.lockf(fd, fcntl.LOCK_SH|fcntl.LOCK_NB)
try:
# log_error("checking md5sum")

4
koji/__init__.py
View file

@ -1467,7 +1467,7 @@ class ClientSession(object):
fo = file(localfile, "r") #specify bufsize?
totalsize = os.path.getsize(localfile)
ofs = 0
md5sum = md5_constructor.new()
md5sum = md5_constructor()
debug = self.opts.get('debug',False)
if callback:
callback(0, totalsize, 0, 0, 0)
@ -1484,7 +1484,7 @@ class ClientSession(object):
sz = ofs
else:
offset = ofs
digest = md5_constructor.new(contents).hexdigest()
digest = md5_constructor(contents).hexdigest()
sz = size
del contents
tries = 0

2
www/lib/kojiweb/util.py
View file

@ -73,7 +73,7 @@ def _genToken(req, tstamp=None):
return ''
if tstamp == None:
tstamp = _truncTime()
return md5_constructor.new(user + str(tstamp) + req.get_options()['Secret']).hexdigest()[-8:]
return md5_constructor(user + str(tstamp) + req.get_options()['Secret']).hexdigest()[-8:]
def _getValidTokens(req):
tokens = []