Author: lslezak Date: Thu Sep 8 11:31:50 2011 New Revision: 65599 URL: http://svn.opensuse.org/viewcvs/yast?rev=65599&view=rev Log: - GPG.ycp - fixed initialization after creating a new GPG key, fixed creating a GPG key in KDE desktop or after logging via plain "su" (gpg agent problem) (bnc#715242) Modified: trunk/yast2/library/gpg/src/GPG.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/gpg/src/GPG.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/gpg/src/GPG.ycp?rev=65599&r1=65598&r2=65599&view=diff ============================================================================== --- trunk/yast2/library/gpg/src/GPG.ycp (original) +++ trunk/yast2/library/gpg/src/GPG.ycp Thu Sep 8 11:31:50 2011 @@ -36,7 +36,7 @@ */ global boolean Init(string home_dir, boolean force) { - if (FileUtils::IsDirectory(home_dir) != true) + if (home_dir != "" && FileUtils::IsDirectory(home_dir) != true) { y2error("Path %1 is not a directory", home_dir); return false; @@ -253,7 +253,7 @@ global boolean CreateKey() { string xterm = "/usr/bin/xterm"; - string command = buildGPGcommand("--gen-key"); + string command = "GPG_AGENT_INFO='' " + buildGPGcommand("--gen-key"); boolean text_mode = UI::GetDisplayInfo()["TextMode"]:false; y2debug("text_mode: %1", text_mode); @@ -272,10 +272,10 @@ string exit_file = ((string)SCR::Read(.target.tmpdir)) + "/gpg_tmp_exit_file"; if (FileUtils::Exists(exit_file)) { - SCR::Execute(.target.execute, "rm -f " + exit_file); + SCR::Execute(.target.bash, "rm -f " + exit_file); } - command = "LC_ALL=C " + xterm + " -e \"" + command + "; echo $? > " + exit_file + "\""; + command = "LC_ALL=en_US.UTF-8 " + xterm + " -e \"" + command + "; echo $? > " + exit_file + "\""; y2internal("Executing: %1", command); // in Qt start GPG in a xterm window @@ -298,7 +298,7 @@ } else { - command = "LC_ALL=C " + command; + command = "LC_ALL=en_US.UTF-8 " + command; y2internal("Executing in terminal: %1", command); // in ncurses use UI::RunInTerminal ret = UI::RunInTerminal(command) == 0; Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=65599&r1=65598&r2=65599&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Thu Sep 8 11:31:50 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Sep 8 09:29:27 UTC 2011 - lslezak@suse.cz + +- GPG.ycp - fixed initialization after creating a new GPG key, + fixed creating a GPG key in KDE desktop or after logging via + plain "su" (gpg agent problem) (bnc#715242) + +------------------------------------------------------------------- Mon Sep 5 16:40:22 UTC 2011 - lslezak@suse.cz - added new Systemd.ycp module for handling systemd configuration, -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org