devel/common Makefile.common,1.24,1.25

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/extras/devel/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8289

Modified Files:
	Makefile.common 
Log Message:
From: Ville Skyttä <ville.skytta at iki.fi>
Subject: Patch: robustify find-user in Makefile.common

Here's a quick patch for Makefile.common that avoids empty user being
committed to tobuild [1] when one uses a CVS root like: 

  :ext:@cvs.fedora.redhat.com:/...

[1] https://www.redhat.com/archives/fedora-extras-commits/2005-June/msg01214.html



Index: Makefile.common
===================================================================
RCS file: /cvs/extras/devel/common/Makefile.common,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Makefile.common	17 Jun 2005 22:03:08 -0000	1.24
+++ Makefile.common	20 Jun 2005 17:05:37 -0000	1.25
@@ -307,7 +307,7 @@
 	@echo
 
 define find-user
-if [ `cat CVS/Root |grep -c @` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
+if [ `cat CVS/Root |grep -c [^:]@` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
 endef
 USER := $(shell $(find-user))