From: Ross Burton <ross.burton@intel.com>
Date: Thu, 26 Jun 2014 14:16:55 +0000 (+0100)
Subject: patch.bbclass: unset TMPDIR after use
X-Git-Tag: 2015-4~2457
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=51ea4378864f1468df2ca282a84f78a17d6861aa;p=openembedded-core.git

patch.bbclass: unset TMPDIR after use

GNU Patch < 2.6.1 has a race condition so we create a per-instance TMPDIR to
avoid this.  This was implemented by setting os.environ[TMPDIR] but at the end
of do_patch the temporary directory is deleted but TMPDIR is not unset.

In general this doesn't cause a problem but if do_patch is embedded in a larger
function then TMPDIR is set to a directory that doesn't exist.  Avoid this by
removing TMPDIR from os.environ when the directory is deleted.

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 86c65b3b8d..1e2aab0418 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -177,6 +177,7 @@ python patch_do_patch() {
             bb.fatal(str(e))
 
     bb.utils.remove(process_tmpdir, True)
+    del os.environ['TMPDIR']
 }
 patch_do_patch[vardepsexclude] = "PATCHRESOLVE"