[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 2/8] docker.py/build: support binary files in --extra-files
From: |
Paolo Bonzini |
Subject: |
[PATCH v2 2/8] docker.py/build: support binary files in --extra-files |
Date: |
Thu, 21 May 2020 08:45:29 -0400 |
Read the --extra-files in binary mode to avoid encoding errors.
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
tests/docker/docker.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index ad61747bae..85e1dda10f 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -56,15 +56,19 @@ class EngineEnum(enum.IntEnum):
USE_ENGINE = EngineEnum.AUTO
+def _bytes_checksum(bytes):
+ """Calculate a digest string unique to the text content"""
+ return hashlib.sha1(bytes).hexdigest()
+
def _text_checksum(text):
"""Calculate a digest string unique to the text content"""
- return hashlib.sha1(text.encode('utf-8')).hexdigest()
+ return _bytes_checksum(text.encode('utf-8'))
def _read_dockerfile(path):
return open(path, 'rt', encoding='utf-8').read()
def _file_checksum(filename):
- return _text_checksum(_read_dockerfile(filename))
+ return _bytes_checksum(open(filename, 'rb').read())
def _guess_engine_command():
--
2.26.2
- [PATCH v2 0/8] run-coverity-scan: misc improvements, especially for docker mode, Paolo Bonzini, 2020/05/21
- [PATCH v2 2/8] docker.py/build: support binary files in --extra-files,
Paolo Bonzini <=
- [PATCH v2 4/8] run-coverity-scan: use docker.py, Paolo Bonzini, 2020/05/21
- [PATCH v2 1/8] docker.py/build: support -t and -f arguments, Paolo Bonzini, 2020/05/21
- [PATCH v2 7/8] run-coverity-scan: download tools outside the container, Paolo Bonzini, 2020/05/21
- [PATCH v2 3/8] run-coverity-scan: get Coverity token and email from special git config section, Paolo Bonzini, 2020/05/21
- [PATCH v2 8/8] run-coverity-scan: support --update-tools-only --docker, Paolo Bonzini, 2020/05/21
- [PATCH v2 6/8] run-coverity-scan: use --no-update-tools in docker run, Paolo Bonzini, 2020/05/21
- [PATCH v2 5/8] run-coverity-scan: add --no-update-tools option, Paolo Bonzini, 2020/05/21