Merge pull request #7227 from Mic92/git

source/git: use finally block to delete ssh private key
buildbot · Dec 3, 2023 · b623c79 · b623c79
2 parents f227b3f + b305fa8
commit b623c79
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/master/buildbot/steps/source/git.py b/master/buildbot/steps/source/git.py
@@ -143,11 +143,9 @@ def run_vc(self, branch, revision, patch):
                 yield self.patch(patch)
             yield self.parseGotRevision()
             res = yield self.parseCommitDescription()
-            yield self._removeSshPrivateKeyIfNeeded()
             return res
-        except Exception:
+        finally:
             yield self._removeSshPrivateKeyIfNeeded()
-            raise
 
     @defer.inlineCallbacks
     def mode_full(self):