Author: jsuchome Date: Tue Jul 26 15:53:04 2011 New Revision: 65018 URL: http://svn.opensuse.org/viewcvs/yast?rev=65018&view=rev Log: - give full paths to public key files to isCompliant (bnc#706646) - 2.17.102 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/VERSION?rev=65018&r1=65017&r2=65018&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/VERSION Tue Jul 26 15:53:04 2011 @@ -1 +1 @@ -2.17.101 +2.17.102 Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp?rev=65018&r1=65017&r2=65018&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/control/src/ProductProfile.ycp Tue Jul 26 15:53:04 2011 @@ -51,7 +51,17 @@ string dir_file = Pkg::SourceProvideOptionalFile (src_id, 1, "/directory.yast"); map out = (map) SCR::Execute (.target.bash_output, sformat ( "grep 'gpg-pubkey' %1 2>/dev/null", dir_file)); - list<string> keys = filter (string k, splitstring (out["stdout"]:"", "\n"), ``(k != "")); + list<string> keys = []; + foreach (string k, splitstring (out["stdout"]:"", "\n"), { + if (k != "") + { + string key = Pkg::SourceProvideOptionalFile (src_id, 1, "/" + k); + if (key != nil) + { + keys = add (keys, key); + } + } + }); return keys; } Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes?rev=65018&r1=65017&r2=65018&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Tue Jul 26 15:53:04 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jul 26 15:47:38 CEST 2011 - jsuchome@suse.cz + +- give full paths to public key files to isCompliant (bnc#706646) +- 2.17.102 + +------------------------------------------------------------------- Fri Jul 22 16:09:08 CEST 2011 - jsuchome@suse.cz - do not use SourceProvideSignedFile for product profile -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org