Author: mlandres Date: Fri Jun 27 16:19:28 2008 New Revision: 10480 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10480&view=rev Log: Invoke gpg with --homdir Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=10480&r1=10479&r2=10480&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Fri Jun 27 16:19:28 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "26") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "5") +SET(LIBZYPP_PATCH "6") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=10480&r1=10479&r2=10480&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Fri Jun 27 16:19:28 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 4.26.6 +- revision 10480 + +------------------------------------------------------------------- Fri Jun 20 15:31:57 CEST 2008 - ma@suse.de - Fix permanent duplication of gpg keys in the rpm database. Also Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc?rev=10480&r1=10479&r2=10480&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/PublicKey.cc Fri Jun 27 16:19:28 2008 @@ -23,6 +23,7 @@ #include "zypp/base/Exception.h" #include "zypp/base/Logger.h" #include "zypp/Date.h" +#include "zypp/TmpPath.h" #include <ctime> @@ -57,7 +58,7 @@ std::string asString() const { - return "[" + id() + "] [" + name() + "] [" + fingerprint() + "]"; + return "[" + id() + "-" + str::hexstring(created(),8).substr(2) + "] [" + name() + "] [" + fingerprint() + "]"; } std::string armoredData() const @@ -97,6 +98,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", @@ -105,6 +107,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