Author: jsuchome Date: Mon May 21 13:24:40 2007 New Revision: 38059 URL: http://svn.opensuse.org/viewcvs/yast?rev=38059&view=rev Log: - fixed signing content file (#275883) - fixed exporting gpg key (#275900) - 2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION?rev=38059&r1=38058&r2=38059&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/VERSION Mon May 21 13:24:40 2007 @@ -1 +1 @@ -2.13.18 +2.13.19 Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes?rev=38059&r1=38058&r2=38059&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/package/yast2-add-on-creator.changes Mon May 21 13:24:40 2007 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 21 10:46:20 CEST 2007 - jsuchome@suse.cz + +- fixed signing content file (#275883) +- fixed exporting gpg key (#275900) +- 2.13.19 + +------------------------------------------------------------------- Thu May 17 16:44:59 CEST 2007 - jsuchome@suse.cz - clear pattern data map before importing next one (#273528) Modified: branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp?rev=38059&r1=38058&r2=38059&view=diff ============================================================================== --- branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp (original) +++ branches/SuSE-SLE-10-SP1-Branch/add-on-creator/src/AddOnCreator.ycp Mon May 21 13:24:40 2007 @@ -1631,28 +1631,12 @@ string pw_path = tmpdir + "/pw"; SCR::Write (.target.string, pw_path, passphrase); - // sign the content file - SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); - out = (map) SCR::Execute (.target.bash_output, sformat(" - gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", - local_key, base_path, pw_path) - ); - if (out["exit"]:0 != 0) - { - if (Mode::commandline ()) - Report::Error (out["stderr"]:""); - else - // error message - Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); - return false; - } - // export the key: command = sformat ("gpg --export -a %1 > '%2/gpg-pubkey-%3-%1.asc'", local_key, base_path, big_key); SCR::Execute (.target.bash, command, $["LANG" : "C"]); - // than, make a sha1 sum of that key (content file is modified last time) + // make a sha1 sum of that key (content file is modified last time) out = (map) SCR::Execute (.target.bash_output, sformat ("cd '%1'; ls -A1 gpg-pubkey*", base_path)); @@ -1666,8 +1650,24 @@ SCR::Execute (.target.bash, command, $["LANG" : "C"]); }); + // sign the content file + SCR::Execute (.target.bash, sformat ("rm -f '%1/content.asc'", base_path)); + out = (map) SCR::Execute (.target.bash_output, sformat(" + gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2/content' < %3", + local_key, base_path, pw_path) + ); + if (out["exit"]:0 != 0) + { + if (Mode::commandline ()) + Report::Error (out["stderr"]:""); + else + // error message + Popup::ErrorDetails (_("Signing of the product failed."), out["stderr"]:""); + return false; + } + SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2/content.key'",local_key, base_path)); + sformat("gpg --export -a %1 > '%2/content.key'",local_key, base_path)); // sign products file string products_path = full_media_paths[0]:"" + "/products"; @@ -1678,7 +1678,7 @@ sformat("gpg --no-tty --passphrase-fd 0 --detach-sign -u %1 -a '%2' < %3", local_key, products_path, pw_path)); SCR::Execute (.target.bash, - sformat("gpg --export -a -u %1 > '%2.key'", local_key,products_path)); + sformat("gpg --export -a %1 > '%2.key'", local_key,products_path)); } SCR::Execute (.target.remove, pw_path); return true; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org