Skip to content

Commit c4c87ee

Browse files
committed
[FAB-9219] Remove superfluous "||:" from Makefile rules
A number of trailing "||:" on Makefile rules is simply a hacky way of representing the equivalent leading "-", meaning, "Continue processing if this command fails." Given that all of those suffixes are on commands that have a leading "-", there is no reason to keep them. Change-Id: I911a35b6ce9eef7d3b5b7a079a2761068b2af4d6 Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
1 parent 30806c1 commit c4c87ee

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -422,25 +422,25 @@ protos: buildenv
422422
%-docker-clean:
423423
$(eval TARGET = ${patsubst %-docker-clean,%,${@}})
424424
-docker images -q $(DOCKER_NS)/fabric-$(TARGET) | xargs -I '{}' docker rmi -f '{}'
425-
-@rm -rf $(BUILD_DIR)/image/$(TARGET) ||:
425+
-@rm -rf $(BUILD_DIR)/image/$(TARGET)
426426

427427
docker-clean: $(patsubst %,%-docker-clean, $(IMAGES))
428428

429429
.PHONY: clean
430430
clean: docker-clean unit-test-clean release-clean
431-
-@rm -rf $(BUILD_DIR) ||:
431+
-@rm -rf $(BUILD_DIR)
432432

433433
.PHONY: clean-all
434434
clean-all: clean gotools-clean dist-clean
435-
-@rm -rf /var/hyperledger/* ||:
435+
-@rm -rf /var/hyperledger/*
436436

437437
.PHONY: dist-clean
438438
dist-clean:
439-
-@rm -rf release/windows-amd64/hyperledger-fabric-windows-amd64.$(PROJECT_VERSION).tar.gz ||:
440-
-@rm -rf release/darwin-amd64/hyperledger-fabric-darwin-amd64.$(PROJECT_VERSION).tar.gz ||:
441-
-@rm -rf release/linux-amd64/hyperledger-fabric-linux-amd64.$(PROJECT_VERSION).tar.gz ||:
442-
-@rm -rf release/linux-ppc64le/hyperledger-fabric-linux-ppc64le.$(PROJECT_VERSION).tar.gz ||:
443-
-@rm -rf release/linux-s390x/hyperledger-fabric-linux-s390x.$(PROJECT_VERSION).tar.gz ||:
439+
-@rm -rf release/windows-amd64/hyperledger-fabric-windows-amd64.$(PROJECT_VERSION).tar.gz
440+
-@rm -rf release/darwin-amd64/hyperledger-fabric-darwin-amd64.$(PROJECT_VERSION).tar.gz
441+
-@rm -rf release/linux-amd64/hyperledger-fabric-linux-amd64.$(PROJECT_VERSION).tar.gz
442+
-@rm -rf release/linux-ppc64le/hyperledger-fabric-linux-ppc64le.$(PROJECT_VERSION).tar.gz
443+
-@rm -rf release/linux-s390x/hyperledger-fabric-linux-s390x.$(PROJECT_VERSION).tar.gz
444444

445445
%-release-clean:
446446
$(eval TARGET = ${patsubst %-release-clean,%,${@}})

0 commit comments

Comments
 (0)