Author: lslezak Date: Tue Dec 23 08:43:50 2008 New Revision: 54341 URL: http://svn.opensuse.org/viewcvs/yast?rev=54341&view=rev Log: - CommandLine.ycp - fixed handling of multiline help texts in 'xmlhelp' command (bnc#430848) Modified: branches/SuSE-Code-11-Branch/yast2/library/commandline/src/CommandLine.ycp branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-Branch/yast2/library/commandline/src/CommandLine.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/library/commandline/src/CommandLine.ycp?rev=54341&r1=54340&r2=54341&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/library/commandline/src/CommandLine.ycp (original) +++ branches/SuSE-Code-11-Branch/yast2/library/commandline/src/CommandLine.ycp Tue Dec 23 08:43:50 2008 @@ -713,7 +713,22 @@ y2debug("cmdlinespec: %1", cmdlinespec); foreach(string action, map description, actions, { - string help = description["help"]:""; + string help = ""; + + // help text might be a simple string or a multiline text (list<string>) + any help_value = description["help"]:nil; + if (is(help_value, string)) + { + help = (string)help_value; + } + else if (is(help_value, list<string>)) + { + help = mergestring((list<string>)help_value, "\n"); + } + else + { + y2error("Unsupported data type for 'help' key: %1, use 'string' or 'list<string>' type!", help_value); + } list<map> opts = []; Modified: branches/SuSE-Code-11-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/yast2/package/yast2.changes?rev=54341&r1=54340&r2=54341&view=diff ============================================================================== --- branches/SuSE-Code-11-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-Branch/yast2/package/yast2.changes Tue Dec 23 08:43:50 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Dec 23 08:38:26 CET 2008 - lslezak@suse.cz + +- CommandLine.ycp - fixed handling of multiline help texts in + 'xmlhelp' command (bnc#430848) + +------------------------------------------------------------------- Mon Dec 22 13:02:28 CET 2008 - lslezak@suse.cz - PackageCallbacks.ycp - do not log a password in URL (bnc#460978) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org