[svn-commits] trunk r1072 - in /trunk: ./ Makefile

[svn-commits at lists.digium.com]

Author: kpfleming
Date: Wed May 17 17:30:46 2006
New Revision: 1072

URL: http://svn.digium.com/view/zaptel?rev=1072&view=rev
Log:
Merged revisions 1071 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1071 | kpfleming | 2006-05-17 17:26:53 -0500 (Wed, 17 May 2006) | 2 lines

fix more buglets from my recent cleanups

........

Modified:
    trunk/   (props changed)
    trunk/Makefile

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.2-merged (original)
+++ branch-1.2-merged Wed May 17 17:30:46 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069
+/branches/1.2:1-916,918-936,938-949,958,962,970,990,1004,1011,1017,1031,1033,1060,1062,1064-1066,1069,1071

Modified: trunk/Makefile
URL: http://svn.digium.com/view/zaptel/trunk/Makefile?rev=1072&r1=1071&r2=1072&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Wed May 17 17:30:46 2006
@@ -388,7 +388,7 @@
 		echo "Updating from Subversion..." ; \
 		svn update | tee update.out; \
 		rm -f .version; \
-		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
 			grep ^C update.out | cut -b4- ; \
 		fi ; \
@@ -397,7 +397,7 @@
 		echo "Updating from CVS..." ; \
 		cvs -q -z3 update -Pd | tee update.out; \
 		rm -f .version; \
-		if [ `grep -q -c ^C update.out` -gt 0 ]; then \
+		if [ `grep -c ^C update.out` -gt 0 ]; then \
 			echo ; echo "The following files have conflicts:" ; \
 			grep ^C update.out | cut -d' ' -f2- ; \
 		fi ; \