Commit 5c8aedf8 authored by Luke Macken's avatar Luke Macken

Handle cases when we can't import meliae from the payload

parent ca3aee4e
...@@ -601,6 +601,7 @@ class PyrasiteWindow(Gtk.Window): ...@@ -601,6 +601,7 @@ class PyrasiteWindow(Gtk.Window):
if 'No module named meliae' in output: if 'No module named meliae' in output:
log.error('Error: %s is unable to import `meliae`' % log.error('Error: %s is unable to import `meliae`' %
proc.title.strip()) proc.title.strip())
return
self.update_progress(0.35) self.update_progress(0.35)
# Clear previous model # Clear previous model
...@@ -610,9 +611,6 @@ class PyrasiteWindow(Gtk.Window): ...@@ -610,9 +611,6 @@ class PyrasiteWindow(Gtk.Window):
try: try:
objects = loader.load('/tmp/%d.objects' % proc.pid, objects = loader.load('/tmp/%d.objects' % proc.pid,
show_prog=False) show_prog=False)
except NameError:
log.debug("Meliae not available, continuing...")
return
except: except:
log.debug("Falling back to slower meliae object dump loader") log.debug("Falling back to slower meliae object dump loader")
objects = loader.load('/tmp/%d.objects' % proc.pid, objects = loader.load('/tmp/%d.objects' % proc.pid,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment