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

explicit encoding for text file operations

Browse source 
Fixes: https://pagure.io/koji/issue/2641
This commit is contained in:
Tomas Kopecek 2021-01-14 16:37:47 +01:00
parent ffa0912bc0
commit 96ae0ecef5
29 changed files with 136 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

8
vm/kojivmd
View file

@ -722,7 +722,7 @@ class VMExecTask(BaseTaskHandler):
self.verifyChecksum(localpath, fileinfo['checksum'],
koji.CHECKSUM_TYPES[fileinfo['checksum_type']])
return open(localpath, 'r')
return open(localpath, 'rb')
def getFile(self, buildinfo, archiveinfo, offset, length, type):
"""
@ -751,7 +751,7 @@ class VMExecTask(BaseTaskHandler):
if offset == 0:
if os.path.exists(local_path):
raise koji.BuildError('cannot overwrite %s' % local_path)
fobj = open(local_path, 'w')
fobj = open(local_path, 'wb')
else:
if not os.path.isfile(local_path):
raise koji.BuildError('% does not exist' % local_path)
@ -759,7 +759,7 @@ class VMExecTask(BaseTaskHandler):
if offset != size:
raise koji.BuildError('cannot write to %s at offset %s, size is %s' %
(local_path, offset, size))
fobj = open(local_path, 'r+')
fobj = open(local_path, 'rb+')
fobj.seek(offset)
data = base64.b64decode(contents)
fobj.write(data)
@ -792,7 +792,7 @@ class VMExecTask(BaseTaskHandler):
else:
raise koji.BuildError('unsupported checksum algorithm: %s' % algo)
with open(local_path, 'r') as f:
with open(local_path, 'rb') as f:
while True:
data = f.read(1048576)
if not data: