From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Tue, 4 Dec 2007 09:39:01 +0000 (+0000)
Subject: more robustly fails when a specfile cannot be found
X-Git-Tag: 4.2-rc2~383
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e7f35d04dc5dfc4a9eaf6e83a19d5fbe682a1c5;p=build.git

more robustly fails when a specfile cannot be found
---

diff --git a/Makefile b/Makefile
index 85af3aa3..69446128 100644
--- a/Makefile
+++ b/Makefile
@@ -262,11 +262,10 @@ $($(1).specpath):
 	  $(foreach line,$($(1)-SPECVARS), \
 	    echo "%define" $(word 1,$(subst =, ,$(line))) "$(word 2,$(subst =, ,$(line)))" >> $($(1).specpath) ;))
 	$(if $($($(1).module)-SVNPATH),\
-          svn cat $($($(1).module)-SVNPATH)/$($(1)-SPEC) >> $($(1).specpath),\
+          svn cat $($($(1).module)-SVNPATH)/$($(1)-SPEC) >> $($(1).specpath) || rm $($(1).specpath),\
           cvs -d $($($(1).module)-CVSROOT) checkout \
 	      -r $($($(1).module)-TAG) \
 	      -p $($(1).module)/$($(1)-SPEC) >> $($(1).specpath))
-	@if [ -z $($(1).specpath) ] ; then rm $($(1).specpath) ; exit 1 ; fi
 endef
 
 $(foreach package,$(ALL),$(eval $(call target_spec,$(package))))