Mailinglist Archive: yast-commit (133 mails)

[jsuchome@xxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Mon Aug  9 10:32:28 2010
New Revision: 62370

URL: http://svn.opensuse.org/viewcvs/yast?rev=62370&view=rev
Log:
- correct file name of exported keys (bnc#622569)
- 2.20.0 


Modified:
    trunk/add-on-creator/VERSION
    trunk/add-on-creator/package/yast2-add-on-creator.changes
    trunk/add-on-creator/src/AddOnCreator.ycp

Modified: trunk/add-on-creator/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/VERSION?rev=62370&r1=62369&r2=62370&view=diff
==============================================================================
--- trunk/add-on-creator/VERSION (original)
+++ trunk/add-on-creator/VERSION Mon Aug  9 10:32:28 2010
@@ -1 +1 @@
-2.19.2
+2.20.0

Modified: trunk/add-on-creator/package/yast2-add-on-creator.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/package/yast2-add-on-creator.changes?rev=62370&r1=62369&r2=62370&view=diff
==============================================================================
--- trunk/add-on-creator/package/yast2-add-on-creator.changes (original)
+++ trunk/add-on-creator/package/yast2-add-on-creator.changes Mon Aug  9 
10:32:28 2010
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Aug  9 10:31:21 CEST 2010 - jsuchome@xxxxxxx
+
+- correct file name of exported keys (bnc#622569)
+- 2.20.0 
+
+-------------------------------------------------------------------
 Tue Jul 27 13:48:15 CEST 2010 - jsuchome@xxxxxxx
 
 - cleanup the preparation directory for building iso image

Modified: trunk/add-on-creator/src/AddOnCreator.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/add-on-creator/src/AddOnCreator.ycp?rev=62370&r1=62369&r2=62370&view=diff
==============================================================================
--- trunk/add-on-creator/src/AddOnCreator.ycp (original)
+++ trunk/add-on-creator/src/AddOnCreator.ycp Mon Aug  9 10:32:28 2010
@@ -2678,16 +2678,21 @@
     map out = (map)SCR::Execute (.target.bash_output, command, $["LANG" : 
"C"]);
     string local_key   = deletechars (out["stdout"]:"0","\n");
 
-    out = (map)SCR::Execute (.target.bash_output, sformat ("gpg 
--list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $5}'| sed 
's/........$//g'", key, local_key));
-    string big_key     = deletechars (out["stdout"]:"0","\n");
+    // see /usr/share/doc/packages/gpg2/DETAILS for gpg --list-secret-keys 
--with-colons
+    // file name of exported key: keyid-creation date of the selfsignature 
(ie. e85fc3fc-4c1b74be)
+
+    out = (map)SCR::Execute (.target.bash_output, sformat ("gpg 
--list-secret-keys --with-colons %1| grep %2 | gawk -F: '{print $6}'", key, 
local_key));
+
+    integer creation_date      = tointeger (deletechars 
(out["stdout"]:"0","\n"));
+    string creation_date_s     = substring (tohexstring (creation_date), 2); 
// use hex string without leading 0x
 
     // save the passphrase
     string pw_path     = tmpdir + "/pw";
     SCR::Write (.target.string, pw_path, passphrase);
 
     // export the key:
-    command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'",
-       local_key, base_path, big_key);
+    command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%1-%3.asc'",
+       tolower (local_key), base_path, creation_date_s);
     SCR::Execute (.target.bash, command, $["LANG" : "C"]);
 
     // make a sha1 sum of that key (content file is modified last time)

--
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx