diff options
| author | Jon Oster <jon.oster@here.com> | 2018-06-07 11:10:07 +0200 |
|---|---|---|
| committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-06-12 10:23:29 +0200 |
| commit | cf0d753ed0842ce472454b4c7c2cbff8db341612 (patch) | |
| tree | e3f53d2988d6fd656ae694dce6ed455e18211979 | |
| parent | 515c54a370cfbe10b4fbc99d7861b8a6b892f6b6 (diff) | |
| download | meta-updater-cf0d753ed0842ce472454b4c7c2cbff8db341612.tar.gz | |
Bugfix: strip whitespace and newlines from tuf URL in credentials.zip
| -rw-r--r-- | recipes-sota/aktualizr/garage-sign-version.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-sota/aktualizr/garage-sign-version.inc b/recipes-sota/aktualizr/garage-sign-version.inc index 66e3ffd..f2d04e8 100644 --- a/recipes-sota/aktualizr/garage-sign-version.inc +++ b/recipes-sota/aktualizr/garage-sign-version.inc | |||
| @@ -8,7 +8,7 @@ python () { | |||
| 8 | with zipfile.ZipFile(d.getVar("SOTA_PACKED_CREDENTIALS", True), 'r') as zip_ref: | 8 | with zipfile.ZipFile(d.getVar("SOTA_PACKED_CREDENTIALS", True), 'r') as zip_ref: |
| 9 | try: | 9 | try: |
| 10 | with zip_ref.open('tufrepo.url', mode='r') as url_file: | 10 | with zip_ref.open('tufrepo.url', mode='r') as url_file: |
| 11 | url = url_file.read().decode() + '/health/version' | 11 | url = url_file.read().decode().strip(' \t\n') + '/health/version' |
| 12 | except (KeyError, ValueError, RuntimeError): | 12 | except (KeyError, ValueError, RuntimeError): |
| 13 | return | 13 | return |
| 14 | r = urllib.request.urlopen(url) | 14 | r = urllib.request.urlopen(url) |