Author: mlandres Date: Fri Jun 27 16:50:16 2008 New Revision: 10483 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10483&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-10_2-Branch/libzypp/VERSION URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzypp... ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/VERSION (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/VERSION Fri Jun 27 16:50:16 2008 @@ -61,5 +61,5 @@ m4_define([LIBZYPP_MINOR], [17]) m4_define([LIBZYPP_COMPATMINOR], [15]) dnl ================================================== -m4_define([LIBZYPP_PATCH], [0]) +m4_define([LIBZYPP_PATCH], [1]) dnl ================================================== Modified: branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzypp... ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:50:16 2008 @@ -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.17.1 +- revision 10483 + +------------------------------------------------------------------- Fri Jun 27 11:29:09 CEST 2008 - ma@suse.de - Import newer gpg keys if a trusted key is updated Modified: branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-10_2-Branch/libzypp... ============================================================================== --- branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-10_2-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:50:16 2008 @@ -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; @@ -95,6 +94,7 @@ 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", @@ -103,6 +103,8 @@ "--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