From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Fri, 28 Jul 2006 04:53:14 +0000 (+0000)
Subject: - check if CVS/Root is even accessible; if not, use defaults
X-Git-Tag: planetlab-4_0-rc1~66
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4632022c571ec09cde88b0045f8bfd9f73b50444;p=build.git

- check if CVS/Root is even accessible; if not, use defaults
---

diff --git a/planetlab.mk b/planetlab.mk
index b2f0e6ae..a50d14a3 100644
--- a/planetlab.mk
+++ b/planetlab.mk
@@ -28,15 +28,21 @@
 # Default values
 #
 
+CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
+TAG := HEAD
+
+# Check if a tag has been checked out
 ifneq ($(wildcard CVS/Root),)
+# Check if we are able to access CVS
+CVSTAG := $(shell cvs status planetlab.mk 2>/dev/null | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\([^[:space:]]*\).*/\1/p')
+ifneq ($(CVSTAG),)
 CVSROOT := $(shell cat CVS/Root)
-TAG := $(shell cvs status planetlab.mk | sed -ne 's/[[:space:]]*Sticky Tag:[[:space:]]*\([^[:space:]]*\).*/\1/p')
-ifeq ($(TAG),(none))
+ifeq ($(CVSTAG),(none))
 TAG := HEAD
-endif
 else
-CVSROOT := :pserver:anon@cvs.planet-lab.org:/cvs
-TAG := HEAD
+TAG := $(CVSTAG)
+endif
+endif
 endif
 
 #