From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 17:02:23 +0000 (+0000)
Subject: * Support TMPDIR in apt-extracttemplates (Closes: #191656)
X-Git-Tag: 0.7.21~316^2~394
X-Git-Url: https://git.hcoop.net/ntk/apt.git/commitdiff_plain/8eb5af513dca4b456e86ca6a08efbf93ee23848b

* Support TMPDIR in apt-extracttemplates (Closes: #191656)
Author: mdz
Date: 2003-07-26 00:00:11 GMT
* Support TMPDIR in apt-extracttemplates (Closes: #191656)
---

diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc
index 73b3bc51..eecb7fe2 100644
--- a/cmdline/apt-extracttemplates.cc
+++ b/cmdline/apt-extracttemplates.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: apt-extracttemplates.cc,v 1.14 2003/01/11 07:18:44 jgg Exp $
+// $Id: apt-extracttemplates.cc,v 1.15 2003/07/26 00:00:11 mdz Exp $
 /* ######################################################################
    
    APT Extract Templates - Program to extract debconf config and template
@@ -249,7 +249,15 @@ string WriteFile(const char *package, const char *prefix, const char *data)
 {
 	char fn[512];
 	static int i;
-	snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", _config->Find("APT::ExtractTemplates::TempDir", TMPDIR).c_str(), package, prefix, getpid(), i++);
+        char *tempdir = NULL;
+
+        tempdir = getenv("TMPDIR");
+        if (tempdir == NULL)
+             tempdir = TMPDIR;
+
+	snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d",
+                 _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(),
+                 package, prefix, getpid(), i++);
 	FileFd f;
 	if (data == NULL)
 		data = "";
diff --git a/debian/changelog b/debian/changelog
index e4b1c022..8507170e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ apt (0.5.8) unstable; urgency=medium
   * Tweak SGML in apt-extracttemplates.1.sgml so that literal '>' doesn't end
     up in output
   * Document SrcDirectory in apt-ftparchive.1.sgml (Closes: #156370)
+  * Support TMPDIR in apt-extracttemplates (Closes: #191656)
 
  -- Matt Zimmerman <mdz@debian.org>  Fri, 25 Jul 2003 19:44:16 -0400