[Git][ftp-team/dak][master] 3 commits: process_upload: catch exception from exception logging

Mark Hymers pushed to branch master at Debian FTP Team / dak

Commits:

7d9de6de

by Ivo De Decker at 2019-08-18T20:29:03Z

process_upload: catch exception from exception logging

This is a workaround for broken unicode handling. The trigger seems to be an
invalid (expired) key with non-ascii characters.

ee2df83a
by Mark Hymers at 2019-08-18T22:46:58Z
```
Merge branch 'ivodd/dak-uploaderror'
```

8300fb5a

by Mark Hymers at 2019-08-18T22:48:30Z

Log filename causing issue

Signed-off-by: Mark Hymers <mhy@debian.org>

1 changed file:

dak/process_upload.py

Changes:

dak/process_upload.py

@@ -499,7 +499,10 @@ def process_changes(changes_filenames):
              c = daklib.upload.Changes(directory, filename, keyring_files)
              changes.append([directory, c])
          except Exception as e:
 -            Logger.log([filename, "Error while loading changes: {0}".format(e)])
 +            try:
 +                Logger.log([filename, "Error while loading changes file {0}: {1}".format(fn, e)])
 +            except Exception as e:
 +                Logger.log([filename, "Error while loading changes file {0}, with additional error while printing exception: {1}".format(fn, repr(e))])
      changes.sort(key=lambda x: x[1])