diff options
| author | Mika Isojärvi <misojarvi@google.com> | 2017-07-18 13:40:37 -0700 |
|---|---|---|
| committer | Mika Isojärvi <misojarvi@google.com> | 2017-07-18 13:40:37 -0700 |
| commit | ecafdfbfe1f0f951f74440cff7c7af45c7875513 (patch) | |
| tree | 519321963778449578a27e7fd1de6f613659aea6 /scripts/khr_util | |
| parent | 51a288cf8d23830fb48d5b9cf61c7e5cda7301c4 (diff) | |
| parent | 6a26fb1fd062558b912d18c76696fcb17c696894 (diff) | |
| download | VK-GL-CTS-ecafdfbfe1f0f951f74440cff7c7af45c7875513.tar.gz VK-GL-CTS-ecafdfbfe1f0f951f74440cff7c7af45c7875513.tar.bz2 VK-GL-CTS-ecafdfbfe1f0f951f74440cff7c7af45c7875513.zip | |
resolve merge conflicts of 6a26fb1f to deqp-dev
Test: Build apk, run scripts/check_build_sanity.py
Change-Id: I8565da05af24d195d0bf91c22eedd12d29864f5f
Diffstat (limited to 'scripts/khr_util')
| -rw-r--r-- | scripts/khr_util/registry_cache.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/khr_util/registry_cache.py b/scripts/khr_util/registry_cache.py index 9c553b931..e8124a49d 100644 --- a/scripts/khr_util/registry_cache.py +++ b/scripts/khr_util/registry_cache.py @@ -78,7 +78,7 @@ def fetchFile (dstPath, url, checksum): gotChecksum = computeChecksum(data) if checksum != gotChecksum: - raise Exception("Checksum mismatch, exepected %s, got %s" % (checksum, gotChecksum)) + raise Exception("Checksum mismatch, expected %s, got %s" % (checksum, gotChecksum)) writeFile(dstPath, data) |