tmakinen/puppet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix curl error handling in Makefiles

Browse source 
Add option -f to make curl fail on server errors. Fixes #7.
This commit is contained in:
Ossi Salmi 2013-08-14 14:16:24 +03:00
parent 67c3fa4a82
commit d785e48a55
11 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
abusehelper/Makefile
View file

@ -13,11 +13,11 @@ manifest: $(MANIFESTS)/abusehelper.pp
$(PACKAGES)/$(AHTARGET): $(PACKAGES)/$(AHTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(AHSOURCE) test -f $@ || curl -f -o $@ $(AHSOURCE)
$(PACKAGES)/$(IKTARGET): $(PACKAGES)/$(IKTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(IKSOURCE) test -f $@ || curl -f -o $@ $(IKSOURCE)
$(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET) $(MANIFESTS)/abusehelper.pp: $(PACKAGES)/$(AHTARGET) $(PACKAGES)/$(IKTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
abusesa/Makefile
View file

@ -18,7 +18,7 @@ searchmanifest: $(MANIFESTS)/abusesa_search.pp
$(PACKAGES)/$(TARGET): $(PACKAGES)/$(TARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl --digest -u $(USER) -o $@ $(SOURCE) test -f $@ || curl -f --digest -u $(USER) -o $@ $(SOURCE)
$(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET) $(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \
@ -26,7 +26,7 @@ $(MANIFESTS)/abusesa.pp: $(PACKAGES)/$(TARGET)
$(PACKAGES)/$(SEARCHTARGET): $(PACKAGES)/$(SEARCHTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl --digest -u $(USER) -o $@ $(SEARCHSOURCE) test -f $@ || curl -f --digest -u $(USER) -o $@ $(SEARCHSOURCE)
$(MANIFESTS)/abusesa_search.pp: $(PACKAGES)/$(SEARCHTARGET) $(MANIFESTS)/abusesa_search.pp: $(PACKAGES)/$(SEARCHTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
arduino/Makefile
View file

@ -14,11 +14,11 @@ manifest: $(MANIFESTS)/arduino.pp
$(PACKAGES)/$(TARGET32): $(PACKAGES)/$(TARGET32):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE32) test -f $@ || curl -f -o $@ $(SOURCE32)
$(PACKAGES)/$(TARGET64): $(PACKAGES)/$(TARGET64):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE64) test -f $@ || curl -f -o $@ $(SOURCE64)
$(MANIFESTS)/arduino.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64) $(MANIFESTS)/arduino.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64)
@umask 022; echo $@; \ @umask 022; echo $@; \

2
bacula/Makefile
View file

@ -10,7 +10,7 @@ manifest: $(MANIFESTS)/bacula.pp
$(PACKAGES)/$(PACKAGE): $(PACKAGES)/$(PACKAGE):
@umask 022 ; echo $@ ; \ @umask 022 ; echo $@ ; \
curl -o $@ $(BASEURL)/$(PACKAGE) curl -f -o $@ $(BASEURL)/$(PACKAGE)
$(MANIFESTS)/bacula.pp: $(MANIFESTS)/bacula.pp:
@umask 022 ; echo $@ ; \ @umask 022 ; echo $@ ; \

8
flexlm/Makefile
View file

@ -12,22 +12,22 @@ manifest: $(MANIFESTS)/flexlm.pp
$(PACKAGES)/lmutil-$(VERSION).i386.Linux: $(PACKAGES)/lmutil-$(VERSION).i386.Linux:
@umask 022 ; echo $@; \ @umask 022 ; echo $@; \
test -f $@ || curl $(BASEURL)/lmutil-i86_lsb-$(VERSION).tar.gz | \ test -f $@ || curl -f $(BASEURL)/lmutil-i86_lsb-$(VERSION).tar.gz | \
zcat | tar xf - -O > $@ zcat | tar xf - -O > $@
$(PACKAGES)/lmgrd-$(VERSION).i386.Linux: $(PACKAGES)/lmgrd-$(VERSION).i386.Linux:
@umask 022 ; echo $@; \ @umask 022 ; echo $@; \
test -f $@ || curl $(BASEURL)/lmgrd-i86_lsb-$(VERSION).tar.gz | \ test -f $@ || curl -f $(BASEURL)/lmgrd-i86_lsb-$(VERSION).tar.gz | \
zcat | tar xf - -O > $@ zcat | tar xf - -O > $@
$(PACKAGES)/lmutil-$(VERSION).x86_64.Linux: $(PACKAGES)/lmutil-$(VERSION).x86_64.Linux:
@umask 022 ; echo $@; \ @umask 022 ; echo $@; \
test -f $@ || curl $(BASEURL)/lmutil-x64_lsb-$(VERSION).tar.gz | \ test -f $@ || curl -f $(BASEURL)/lmutil-x64_lsb-$(VERSION).tar.gz | \
zcat | tar xf - -O > $@ zcat | tar xf - -O > $@
$(PACKAGES)/lmgrd-$(VERSION).x86_64.Linux: $(PACKAGES)/lmgrd-$(VERSION).x86_64.Linux:
@umask 022 ; echo $@; \ @umask 022 ; echo $@; \
test -f $@ || curl $(BASEURL)/lmgrd-x64_lsb-$(VERSION).tar.gz | \ test -f $@ || curl -f $(BASEURL)/lmgrd-x64_lsb-$(VERSION).tar.gz | \
zcat | tar xf - -O > $@ zcat | tar xf - -O > $@
$(MANIFESTS)/flexlm.pp: download $(MANIFESTS)/flexlm.pp: download

2
hastymail/Makefile
View file

@ -9,7 +9,7 @@ manifest: $(MANIFESTS)/hastymail.pp
$(PACKAGES)/$(HASTYMAILTARGET): $(PACKAGES)/$(HASTYMAILTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(HASTYMAILSOURCE) test -f $@ || curl -f -o $@ $(HASTYMAILSOURCE)
$(MANIFESTS)/hastymail.pp: $(PACKAGES)/$(HASTYMAILTARGET) $(MANIFESTS)/hastymail.pp: $(PACKAGES)/$(HASTYMAILTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

2
murmur/Makefile
View file

@ -11,7 +11,7 @@ manifest: $(MANIFESTS)/murmur.pp
$(PACKAGES)/$(TARGET): $(PACKAGES)/$(TARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -L -o $@ $(SOURCE) test -f $@ || curl -f -L -o $@ $(SOURCE)
$(MANIFESTS)/murmur.pp: $(PACKAGES)/$(TARGET) $(MANIFESTS)/murmur.pp: $(PACKAGES)/$(TARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
phantomjs/Makefile
View file

@ -13,11 +13,11 @@ manifest: $(MANIFESTS)/phantomjs.pp
$(PACKAGES)/$(TARGET32): $(PACKAGES)/$(TARGET32):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE32) test -f $@ || curl -f -o $@ $(SOURCE32)
$(PACKAGES)/$(TARGET64): $(PACKAGES)/$(TARGET64):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE64) test -f $@ || curl -f -o $@ $(SOURCE64)
$(MANIFESTS)/phantomjs.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64) $(MANIFESTS)/phantomjs.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
solr/Makefile
View file

@ -15,11 +15,11 @@ manifest: $(MANIFESTS)/solr.pp
$(PACKAGES)/$(TARGET): $(PACKAGES)/$(TARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE) test -f $@ || curl -f -o $@ $(SOURCE)
$(PACKAGES)/$(PYSOLRTARGET): $(PACKAGES)/$(PYSOLRTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(PYSOLRSOURCE) test -f $@ || curl -f -o $@ $(PYSOLRSOURCE)
$(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET) $(MANIFESTS)/solr.pp: $(PACKAGES)/$(TARGET) $(PACKAGES)/$(PYSOLRTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
teamspeak/Makefile
View file

@ -13,11 +13,11 @@ manifest: $(MANIFESTS)/teamspeak.pp
$(PACKAGES)/$(TARGET32): $(PACKAGES)/$(TARGET32):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE32) test -f $@ || curl -f -o $@ $(SOURCE32)
$(PACKAGES)/$(TARGET64): $(PACKAGES)/$(TARGET64):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(SOURCE64) test -f $@ || curl -f -o $@ $(SOURCE64)
$(MANIFESTS)/teamspeak.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64) $(MANIFESTS)/teamspeak.pp: $(PACKAGES)/$(TARGET32) $(PACKAGES)/$(TARGET64)
@umask 022; echo $@; \ @umask 022; echo $@; \

4
wiki/Makefile
View file

@ -14,11 +14,11 @@ manifest: $(MANIFESTS)/wiki.pp
$(PACKAGES)/$(GWIKITARGET): $(PACKAGES)/$(GWIKITARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(GWIKISOURCE) test -f $@ || curl -f -o $@ $(GWIKISOURCE)
$(PACKAGES)/$(MOINTARGET): $(PACKAGES)/$(MOINTARGET):
@umask 022; echo $@; \ @umask 022; echo $@; \
test -f $@ || curl -o $@ $(MOINSOURCE) test -f $@ || curl -f -o $@ $(MOINSOURCE)
$(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET) $(MANIFESTS)/wiki.pp: $(PACKAGES)/$(GWIKITARGET) $(PACKAGES)/$(MOINTARGET)
@umask 022; echo $@; \ @umask 022; echo $@; \