From e7fe51e6a2ae64d09e15ac332aa96ad2341e37bc Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 6 Dec 2016 17:44:10 +0000 Subject: [PATCH] fix: Pre-set CVSROOT could break build process if local system user != \$JANWARE_USER Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 6e614184..75176c5c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -46,22 +46,15 @@ ifeq ($(JANWARE_USER),) export JANWARE_USER = $(shell id -un) endif +export CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs +export CVS_RSH = ssh + ifneq ($(CLONE_FROM_USER),) export PGIT_CLONE_FROM_USER = $(CLONE_FROM_USER) else export PGIT_CLONE_FROM_USER=$(JANWARE_USER) endif -ifeq ($(CVSROOT),) - CVSROOT = :ext:$(JANWARE_USER)@cvs.jannet.de:/home/jannet/arc/cvs - export CVSROOT -endif - -ifeq ($(CVS_RSH),) - CVS_RSH = ssh - export CVS_RSH -endif - # ------------ commands PGIT = CLONE_PROJECTS="$(PROJECTS)" /bin/bash $(firstword $(wildcard ./ytools/devutil/scripts/pgit.sh /opt/ytools/bin/pgit.sh) pgit.sh-not-found)