Merge pull request #51799 from s0undt3ch/2019.2

Catch attribute error
2025-04-17 10:10:20 +00:00 · 2019-03-05 02:38:07 -07:00 · 2019-03-05 02:38:07 -07:00 · 08e3956781
commit 08e3956781
parent ff5d7d6e59 342244a99c
1 changed files with 7 additions and 1 deletions
--- a/salt/fileclient.py
+++ b/salt/fileclient.py
@ -1030,7 +1030,13 @@ class RemoteClient(Client):
            return

        self._closing = True
-        self.channel.close()
+        channel = None
+        try:
+            channel = self.channel
+        except AttributeError:
+            pass
+        if channel is not None:
+            channel.close()

    def get_file(self,
                 path,