[asterisk-commits] qwell: trunk r43493 - in /trunk: ./ main/cli.c

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Fri Sep 22 12:26:10 2006
New Revision: 43493

URL: http://svn.digium.com/view/asterisk?rev=43493&view=rev
Log:
Merged revisions 43492 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r43492 | qwell | 2006-09-22 10:25:05 -0700 (Fri, 22 Sep 2006) | 2 lines

Make sure we explicitly set the CLI command to not be deprecated, if it isn't.

........

Modified:
    trunk/   (props changed)
    trunk/main/cli.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Fri Sep 22 12:26:10 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489
+/branches/1.4:1-43376,43383,43386,43388,43392,43396,43405,43410,43422,43441,43445,43450,43454,43456,43464,43466,43469,43477,43482,43486,43489,43492

Modified: trunk/main/cli.c
URL: http://svn.digium.com/view/asterisk/trunk/main/cli.c?rev=43493&r1=43492&r2=43493&view=diff
==============================================================================
--- trunk/main/cli.c (original)
+++ trunk/main/cli.c Fri Sep 22 12:26:10 2006
@@ -1153,6 +1153,8 @@
 		   To show command B, you just need to always use ed->_full_cmd.
 		 */
 		e->_deprecated_by = S_OR(ed->_deprecated_by, ed->_full_cmd);
+	} else {
+		e->deprecated = 0;
 	}
 
 	lf = strlen(fulle);