Account for the instance of submodules.pack.Packer #104184

Merged
Sybren A. Stüvel merged 5 commits from Nitin-Rawat-1/flamenco:104183-Error-submitting-job into main 2023-02-17 11:06:08 +01:00
Showing only changes of commit 0abf83b25b - Show all commits

View File

@ -165,13 +165,10 @@ class PackThread(threading.Thread):
log.debug("done") log.debug("done")
self._set_bat_status("DONE") self._set_bat_status("DONE")
if isinstance(self.packer, submodules.pack.Packer):
msg = MsgDone(self.packer.output_path, self.packer.missing_files)
else:
msg = MsgDone( msg = MsgDone(
dr.sybren marked this conversation as resolved

I think the code can be simplified to:

msg = MsgDone(
    self.packer.output_path,
    self.packer.missing_files,
    getattr(self.packer, 'actual_checkout_path', None),
)

That way the entire if can go away, and it's no longer specific to a particular Packer implementation.

I think the code can be simplified to: ```py msg = MsgDone( self.packer.output_path, self.packer.missing_files, getattr(self.packer, 'actual_checkout_path', None), ) ``` That way the entire `if` can go away, and it's no longer specific to a particular `Packer` implementation.
self.packer.output_path, self.packer.output_path,
self.packer.missing_files, self.packer.missing_files,
self.packer.actual_checkout_path, getattr(self.packer, "actual_checkout_path", None),
) )
self.queue.put(msg) self.queue.put(msg)