From d40426ff54d0c84e34edbe02a2a2c9f0d8668671 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Thu, 18 Jun 2020 11:11:53 -0400 Subject: [PATCH] More cleanly error on unknown media Rather than raise ugly unexpected errors and pollute trace log, cleanly handle the likelihood of unknown media. --- confluent_server/bin/osimage | 3 ++- confluent_server/confluent/osimage.py | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/confluent_server/bin/osimage b/confluent_server/bin/osimage index 7014423c..8a092c9d 100644 --- a/confluent_server/bin/osimage +++ b/confluent_server/bin/osimage @@ -184,7 +184,8 @@ def osimport(imagefile): else: print(repr(rsp)) time.sleep(0.5) - list(c.delete('/deployment/importing/{0}'.format(shortname))) + if shortname: + list(c.delete('/deployment/importing/{0}'.format(shortname))) if __name__ == '__main__': main(sys.argv) \ No newline at end of file diff --git a/confluent_server/confluent/osimage.py b/confluent_server/confluent/osimage.py index 4930cead..a366cf10 100644 --- a/confluent_server/confluent/osimage.py +++ b/confluent_server/confluent/osimage.py @@ -1,4 +1,5 @@ #!/usr/bin/python +import confluent.exceptions as exc import confluent.messages as msg import eventlet import eventlet.green.select as select @@ -428,6 +429,8 @@ class MediaImporter(object): self.worker = None self.profiles = [] identity = fingerprint(media) + if not identity: + raise exc.InvalidArgumentException('Unsupported Media') self.percent = 0.0 identity, _ = identity self.phase = 'copying'