From: Klaus Kaempf <kkaempf@suse.de>
Date: Wed, 25 Jul 2007 09:55:36 +0000 (+0000)
Subject: - don't hardcode "/var/tmp" as the temporary directory but
X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f969142432b8ea6d3f068dcac9735b418b817484;p=platform%2Fupstream%2Flibzypp.git

- don't hardcode "/var/tmp" as the temporary directory but
  use filesystem::TmpPath::defaultLocation() instead.

- make filesystem::TmpPath::defaultLocation() configurable
  via environment variable.
---

diff --git a/zypp/KeyRing.cc b/zypp/KeyRing.cc
index 3c57cbd..9fd0b03 100644
--- a/zypp/KeyRing.cc
+++ b/zypp/KeyRing.cc
@@ -15,6 +15,7 @@
 #include <cstdio>
 #include <unistd.h>
 
+#include "zypp/TmpPath.h"
 #include "zypp/ZYppFactory.h"
 #include "zypp/ZYpp.h"
 
@@ -136,7 +137,7 @@ namespace zypp
     /** Offer default Impl. */
     static shared_ptr<Impl> nullimpl()
     {
-      static shared_ptr<Impl> _nullimpl( new Impl( Pathname("/var/tmp") ) );
+      static shared_ptr<Impl> _nullimpl( new Impl( TmpPath::defaultLocation() ) );
       return _nullimpl;
     }
 
diff --git a/zypp/TmpPath.cc b/zypp/TmpPath.cc
index c29fcf8..02a181d 100644
--- a/zypp/TmpPath.cc
+++ b/zypp/TmpPath.cc
@@ -153,7 +153,7 @@ namespace zypp {
     const Pathname &
     TmpPath::defaultLocation()
     {
-      static Pathname p( "/var/tmp" );
+      static Pathname p( getenv("ZYPPTMPDIR") ? getenv("ZYPPTMPDIR") : "/var/tmp" );
       return p;
     }
     ///////////////////////////////////////////////////////////////////
diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index afaee76..9e39aa2 100644
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -14,6 +14,7 @@
 #include <fstream>
 #include <sstream>
 
+#include "zypp/TmpPath.h"
 #include "zypp/base/Logger.h"
 #include "zypp/base/String.h"
 #include "zypp/media/MediaHandler.h"
@@ -342,7 +343,7 @@ MediaHandler::createAttachPoint() const
   // provide a default (temporary) attachpoint
   /////////////////////////////////////////////////////////////////
   const char * defmounts[] = {
-      "/var/adm/mount", "/var/tmp", /**/NULL/**/
+      "/var/adm/mount", filesystem::TmpPath::defaultLocation().c_str(), /**/NULL/**/
   };
 
   Pathname apoint;
diff --git a/zypp/zypp_detail/ZYppImpl.cc b/zypp/zypp_detail/ZYppImpl.cc
index 748333f..ad8af98 100644
--- a/zypp/zypp_detail/ZYppImpl.cc
+++ b/zypp/zypp_detail/ZYppImpl.cc
@@ -14,6 +14,7 @@
 #include <unistd.h>
 #include <iostream>
 #include <fstream>
+#include "zypp/TmpPath.h"
 #include "zypp/base/Logger.h"
 #include "zypp/base/String.h"
 
@@ -388,7 +389,7 @@ namespace zypp
 
     Pathname ZYppImpl::tmpPath() const
     {
-      static TmpDir zypp_tmp_dir("/var/tmp", "zypp.");
+      static TmpDir zypp_tmp_dir( TmpPath::defaultLocation(), "zypp." );
       return zypp_tmp_dir.path();
     }