[asterisk-commits] qwell: branch 1.6.0 r160701 - in /branches/1.6.0: ./ main/manager.c
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Dec 3 14:36:11 CST 2008
Author: qwell
Date: Wed Dec 3 14:36:10 2008
New Revision: 160701
URL: http://svn.digium.com/view/asterisk?view=rev&rev=160701
Log:
Merged revisions 160699-160700 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r160699 | qwell | 2008-12-03 14:32:20 -0600 (Wed, 03 Dec 2008) | 7 lines
Fix typo when ListCategories returns none.
(closes issue #13994)
Reported by: mika
Patches:
ListCategoriesActionPatch.diff uploaded by mika (license 624)
........
r160700 | qwell | 2008-12-03 14:35:36 -0600 (Wed, 03 Dec 2008) | 1 line
Another place this is missing
........
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/main/manager.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=160701&r1=160700&r2=160701
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Wed Dec 3 14:36:10 2008
@@ -1111,7 +1111,7 @@
}
}
if (!ast_strlen_zero(category) && catcount == 0) /* TODO: actually, a config with no categories doesn't even get loaded */
- astman_append(s, "No categories found");
+ astman_append(s, "No categories found\r\n");
ast_config_destroy(cfg);
astman_append(s, "\r\n");
@@ -1146,7 +1146,7 @@
catcount++;
}
if (catcount == 0) /* TODO: actually, a config with no categories doesn't even get loaded */
- astman_append(s, "Error: no categories found");
+ astman_append(s, "Error: no categories found\r\n");
ast_config_destroy(cfg);
astman_append(s, "\r\n");
More information about the asterisk-commits
mailing list