Merge branch 'master' into collectionsSupport

4 years ago · ac1e72eec4
parent c2ee512a99 921f3aa98c
commit ac1e72eec4
1 changed files with 5 additions and 1 deletions
--- a/ansible_mitogen/plugins/action/mitogen_fetch.py
+++ b/ansible_mitogen/plugins/action/mitogen_fetch.py
@ -157,6 +157,10 @@ class ActionModule(ActionBase):
                result.update(dict(changed=False, md5sum=local_md5, file=source, dest=dest, checksum=local_checksum))

        finally:
-            self._remove_tmp_path(self._connection._shell.tmpdir)
+            try:
+                self._remove_tmp_path(self._connection._shell.tmpdir)
+            except AttributeError:
+                # .tmpdir was added to ShellModule in v2.6.0, so old versions don't have it
+                pass

        return result