[svn-commits] tilghman: branch 1.6.0 r118555 - in /branches/1.6.0: ./ main/cli.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue May 27 14:22:03 2008
New Revision: 118555

URL: http://svn.digium.com/view/asterisk?view=rev&rev=118555
Log:
Merged revisions 118554 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r118554 | tilghman | 2008-05-27 14:21:03 -0500 (Tue, 27 May 2008) | 14 lines

Merged revisions 118551 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r118551 | tilghman | 2008-05-27 14:15:27 -0500 (Tue, 27 May 2008) | 6 lines

When showing an error message for a command, don't shorten the command output,
as it tends to confuse the user (it's fine for suggesting other commands,
however).
 Reported by: seanbright (on #asterisk-dev)
 Fixed by: me

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/cli.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/cli.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/cli.c?view=diff&rev=118555&r1=118554&r2=118555
==============================================================================
--- branches/1.6.0/main/cli.c (original)
+++ branches/1.6.0/main/cli.c Tue May 27 14:22:03 2008
@@ -1875,7 +1875,7 @@
 		ast_atomic_fetchadd_int(&e->inuse, 1);
 	AST_RWLIST_UNLOCK(&helpers);
 	if (e == NULL) {
-		ast_cli(fd, "No such command '%s' (type 'help' for help)\n", find_best(args + 1));
+		ast_cli(fd, "No such command '%s' (type 'help %s' for other possible commands)\n", s, find_best(args + 1));
 		goto done;
 	}
 	/*