diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-04 11:15:28 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-04 11:15:28 +0100 |
| commit | c93d14fc05b50a8ee8bb7804579c2912f34c676b (patch) | |
| tree | 1f45c51bd8d3ab33de2610f1663b3ec8e5f49c02 /cmdline/apt-extracttemplates.cc | |
| parent | e2fa0aa64d2249129543f82a213043d96469be1c (diff) | |
| parent | 23bd09778261c945b460b46d855b1a6ef998cfd8 (diff) | |
Merge branch 'debian/sid' into feature/source-deb822
Diffstat (limited to 'cmdline/apt-extracttemplates.cc')
| -rw-r--r-- | cmdline/apt-extracttemplates.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/cmdline/apt-extracttemplates.cc b/cmdline/apt-extracttemplates.cc index 8fe15fdf9..8e1937113 100644 --- a/cmdline/apt-extracttemplates.cc +++ b/cmdline/apt-extracttemplates.cc @@ -47,8 +47,6 @@ using namespace std; -#define TMPDIR "/tmp" - pkgCache *DebFile::Cache = 0; // DebFile::DebFile - Construct the DebFile object /*{{{*/ @@ -253,14 +251,11 @@ string WriteFile(const char *package, const char *prefix, const char *data) { char fn[512]; static int i; - const char *tempdir = NULL; - - tempdir = getenv("TMPDIR"); - if (tempdir == NULL) - tempdir = TMPDIR; + std::string tempdir = GetTempDir(); snprintf(fn, sizeof(fn), "%s/%s.%s.%u%d", - _config->Find("APT::ExtractTemplates::TempDir", tempdir).c_str(), + _config->Find("APT::ExtractTemplates::TempDir", + tempdir.c_str()).c_str(), package, prefix, getpid(), i++); FileFd f; if (data == NULL) |