rpms/iiimf/devel htt_xbe-correct-error-message-r2594-156169.patch, NONE, 1.1 iiimf.spec, 1.40, 1.41

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Apr 28 06:21:21 UTC 2005


Author: tagoh

Update of /cvs/dist/rpms/iiimf/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12099

Modified Files:
	iiimf.spec 
Added Files:
	htt_xbe-correct-error-message-r2594-156169.patch 
Log Message:
- htt_xbe-correct-error-message-r2594-156169.patch: applied to correct the error
  message for iiimx. (#156169)

htt_xbe-correct-error-message-r2594-156169.patch:
 ChangeLog      |    4 ++++
 src/watchdog.c |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

--- NEW FILE htt_xbe-correct-error-message-r2594-156169.patch ---
Index: iiimxcf/htt_xbe/src/watchdog.c
===================================================================
--- iiimxcf/htt_xbe/src/watchdog.c	(revision 2593)
+++ iiimxcf/htt_xbe/src/watchdog.c	(revision 2594)
@@ -573,7 +573,7 @@
   if (my_rdb.start_props) {
     fprintf(stderr,
 	    nl_msg(NL_HTT_PROPS_STILL_RUNNING,
-		   "htt : Warning - htt_props is still running use htt_props to kill this server ...\n")
+		   "iiimx : Warning - htt_props is still running use htt_props to kill this server ...\n")
 	    );
 #ifdef	SunOS
     sigset(SIGINT, (void (*) (int)) clean_up);
@@ -610,7 +610,7 @@
       if (WIFSTOPPED(wstat)) {
 	fprintf(stderr,
 		nl_msg(NL_HTT_SUSPENDED,
-		       "htt_server has been suspended \n")
+		       "iiim-xbe has been suspended \n")
 		);
       } else if (WIFEXITED(wstat)) {
 	switch (Server_Status) {
@@ -627,7 +627,7 @@
 	  break;
 	case RmServerActive:
 	  fprintf(stderr, nl_msg(NL_HTT_SERVER_EXITED_UNKNOWN,
-				 "htt : Warning - htt_server has been terminated without knowledge of htt , restart htt again\n"));
+				 "iiimx : Warning - iiim-xbe has been terminated without knowledge of iiimx , restart iiimx again\n"));
 	  if (my_rdb.start_props)
 	    kill(htt_props_pid, SIGTERM);
 	  exit(0);
@@ -676,14 +676,14 @@
 	case SIGIOT:
 	  fprintf(stderr,
 		  nl_msg(NL_HTT_SERVER_DIED,
-			 "htt : Warning - htt_server died and recovered\n")
+			 "iiimx : Warning - iiim-xbe died and recovered\n")
 		  );
 	  start_htt_server(&htt_server_pid, htt_server_arg);
 	  break;
 	default:
 	  fprintf(stderr,
 		  nl_msg(NL_HTT_SERVER_DIED_UNKNOWN,
-			 "htt : Error - htt_server died. Don't know how to recover\n")
+			 "iiimx : Error - iiim-xbe died. Don't know how to recover\n")
 		  );
 	  if (my_rdb.start_props)
 	    kill(htt_props_pid, SIGTERM);
Index: iiimxcf/htt_xbe/ChangeLog
===================================================================
--- iiimxcf/htt_xbe/ChangeLog	(revision 2593)
+++ iiimxcf/htt_xbe/ChangeLog	(revision 2594)
@@ -1,3 +1,7 @@
+2005-04-28  Akira TAGOH  <tagoh at redhat.com>
+
+	* src/watchdog.c: changed the error messages related to the path renaming.
+
 2005-04-21  Ervin Yan <ervin.yan at sun.com>
 
 	* lib/IMdkit/common/Xfactory.cpp


Index: iiimf.spec
===================================================================
RCS file: /cvs/dist/rpms/iiimf/devel/iiimf.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- iiimf.spec	28 Apr 2005 06:01:51 -0000	1.40
+++ iiimf.spec	28 Apr 2005 06:21:19 -0000	1.41
@@ -92,6 +92,7 @@
 Patch700: htt_xbe-fix-build-20040203.patch
 Patch701: htt_xbe-fix-crash-134035_140503.patch
 Patch702: htt_xbe-fix-x86_64.patch
+Patch703: htt_xbe-correct-error-message-r2594-156169.patch
 ### RH-specific (+50~)
 Patch750: htt_xbe-rh-fix-build-20040203.patch
 
@@ -421,6 +422,7 @@
 %patch700 -p1 -b .700-build-20040203
 %patch701 -p1 -b .701-fix-crash
 %patch702 -p1 -b .702-fix-x86_64
+%patch703 -p0 -b .703-correct-error-message-r2594
 ### RH-specific (+50~)
 %patch750 -p1 -b .750-rh-build-20040203
 ## IIIMXCF(xiiimp) patches (800-)
@@ -984,6 +986,8 @@
 * Thu Apr 28 2005 Akira TAGOH <tagoh at redhat.com>
 - iiimsf-shift-space-for-korean-r2592-156171.patch: applied to allow shift+space
   for Korean. (#156171)
+- htt_xbe-correct-error-message-r2594-156169.patch: applied to correct the error
+  message for iiimx. (#156169)
 
 * Thu Apr 28 2005 Jens Petersen <petersen at redhat.com> - 1:12.2-0.5.svn2578
 - add iiimgcf-event-status-done.patch to fix status_done event (Ervin Yan)




More information about the fedora-cvs-commits mailing list