From: Simon Glass <sjg@chromium.org>
Date: Sat, 20 Jul 2019 18:24:07 +0000 (-0600)
Subject: patman: Reset the output directory when it is removed
X-Git-Tag: v2019.10-rc1~1^2~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=313533018dc175a5552a8ccac9d6bcd780e824df;p=oweals%2Fu-boot.git

patman: Reset the output directory when it is removed

At present outdir remains set ever after the output directory has been
removed. Fix this to avoid trying to access it when it is not present.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/patman/tools.py b/tools/patman/tools.py
index d615227482..0d4705db76 100644
--- a/tools/patman/tools.py
+++ b/tools/patman/tools.py
@@ -83,6 +83,7 @@ def FinaliseOutputDir():
     """Tidy up: delete output directory if temporary and not preserved."""
     if outdir and not preserve_outdir:
         _RemoveOutputDir()
+        outdir = None
 
 def GetOutputFilename(fname):
     """Return a filename within the output directory.
@@ -101,6 +102,7 @@ def _FinaliseForTest():
 
     if outdir:
         _RemoveOutputDir()
+        outdir = None
 
 def SetInputDirs(dirname):
     """Add a list of input directories, where input files are kept.