ref: refs/heads/SuSE-SLE-10-SP3-Branch
commit 11f7b2d8bff75bb9edfbffb6673c8d0210f8e6b0
Author: Michael Andres
Date: Fri Jun 27 14:58:19 2008 +0000
Invoke gpg with --homdir
---
VERSION | 2 +-
package/libzypp.changes | 8 ++++++++
zypp/PublicKey.cc | 6 ++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/VERSION b/VERSION
index c4c7376..7858323 100644
--- a/VERSION
+++ b/VERSION
@@ -49,5 +49,5 @@ dnl ==================================================
m4_define([LIBZYPP_MINOR], [32])
m4_define([LIBZYPP_COMPATMINOR], [15])
dnl ==================================================
-m4_define([LIBZYPP_PATCH], [0])
+m4_define([LIBZYPP_PATCH], [1])
dnl ==================================================
diff --git a/package/libzypp.changes b/package/libzypp.changes
index 8edc7de..c679fa9 100644
--- a/package/libzypp.changes
+++ b/package/libzypp.changes
@@ -1,4 +1,12 @@
-------------------------------------------------------------------
+Fri Jun 27 16:16:50 CEST 2008 - ma@suse.de
+
+- Invoke gpg with --homdir, otherwise command fails if executed
+ within a wrapper. (bnc #401259)
+- version 2.32.1
+- revision 10484
+
+-------------------------------------------------------------------
Thu Jun 26 12:26:11 CEST 2008 - ma@suse.de
- Import newer gpg keys if a trusted key is updated
diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc
index d96eb12..2a87932 100644
--- a/zypp/PublicKey.cc
+++ b/zypp/PublicKey.cc
@@ -21,8 +21,7 @@
#include "zypp/TmpPath.h"
#include "zypp/PathInfo.h"
#include "zypp/Date.h"
-
-//#include <ctime>
+#include "zypp/TmpPath.h"
using std::endl;
@@ -94,6 +93,7 @@ namespace zypp
if ( copy( keyfile, _data_file.path() ) != 0 )
ZYPP_THROW(Exception("Can't copy public key data from " + keyfile.asString() + " to " + _data_file.path().asString() ));
+ filesystem::TmpDir dir;
const char* argv[] =
{
"gpg",
@@ -102,6 +102,8 @@ namespace zypp
"--fixed-list-mode",
"--with-fingerprint",
"--with-colons",
+ "--homedir",
+ dir.path().asString().c_str(),
"--quiet",
"--no-tty",
"--no-greeting",
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Michael Andres