[Jpackage-commits] dist/common Makefile.common,1.11,1.12

jpackage jpackage at ryu.zarb.org
Tue May 27 22:21:45 CEST 2008


Update of /home/projects/jpackage/cvs/dist/common
In directory ryu.zarb.org:/tmp/cvs-serv14330

Modified Files:
	Makefile.common 
Log Message:
Do not allow USER env variable to be clobbered

Index: Makefile.common
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/common/Makefile.common,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** Makefile.common	27 May 2008 20:11:47 -0000	1.11
--- Makefile.common	27 May 2008 20:21:43 -0000	1.12
***************
*** 401,405 ****
  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))
  
  oldbuild:   $(COMMON_DIR)/branches
--- 401,405 ----
  if [ `cat CVS/Root |grep -c [^:]@` -ne 0 ]; then cat CVS/Root  |cut -d @ -f 1 |  sed 's/:.*://' ; else echo $(USER); fi
  endef
! CVSUSER := $(shell $(find-user))
  
  oldbuild:   $(COMMON_DIR)/branches
***************
*** 412,416 ****
  	rm -f tobuild ;\
  	cvs -Q update -C tobuild ;\
! 	echo -e "$(USER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
  	cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
  	popd >/dev/null)
--- 412,416 ----
  	rm -f tobuild ;\
  	cvs -Q update -C tobuild ;\
! 	echo -e "$(CVSUSER)\t$(CVS_REPOSITORY)\t$(TAG)\t$(TARGET)" >> tobuild ;\
  	cvs commit -m "request build of $(CVS_REPOSITORY) $(TAG) for $(TARGET)" tobuild ;\
  	popd >/dev/null)




More information about the JPackage-commits mailing list