diff options
| author | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2010-02-25 04:51:23 +0000 |
|---|---|---|
| committer | schnetter <schnetter@83718e91-0e4f-0410-abf4-91180603181f> | 2010-02-25 04:51:23 +0000 |
| commit | 6029fe2d08c66bf86e0e4167bc1b4e378556496c (patch) | |
| tree | 4ed1a00effb05497e2b9621b82295b1d7825c947 | |
| parent | c6a83eeaf506de39c06c817e01f5c574eb3216c3 (diff) | |
Correct calls to git.
Correct error handling.
git-svn-id: http://svn.cactuscode.org/arrangements/CactusUtils/Formaline/trunk@183 83718e91-0e4f-0410-abf4-91180603181f
| -rw-r--r-- | src/make.configuration.deps | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/make.configuration.deps b/src/make.configuration.deps index 726960e..f6d38fc 100644 --- a/src/make.configuration.deps +++ b/src/make.configuration.deps @@ -323,7 +323,7 @@ $(SCRATCH_BUILD)/cactus-flesh-source.git-tag: $(TARBALL_DIR)/cactus-flesh-source < $(TARBALL_DIR)/cactus-flesh-source.files && \ : rm $(TARBALL_DIR)/cactus-flesh-source.files2 && \ : > $@; \ - } && echo "Formaline: WARNING: Error while adding flesh to git repository" + } || echo "Formaline: WARNING: Error while adding flesh to git repository" .PRECIOUS: $(SCRATCH_BUILD)/cactus-thorn-%.git-tag $(SCRATCH_BUILD)/cactus-thorn-%.git-tag: $(TARBALL_DIR)/cactus-thorn-source-%.files @@ -334,7 +334,7 @@ $(SCRATCH_BUILD)/cactus-thorn-%.git-tag: $(TARBALL_DIR)/cactus-thorn-source-%.fi : xargs ls < $(TARBALL_DIR)/cactus-thorn-source-$*.files \ > $(TARBALL_DIR)/cactus-thorn-source-$*.files2 2> /dev/null && \ xargs '$(GIT-BIN)/git-add-thorn.pl' '$(GIT)' '$(GIT-REPO)' '$(GIT-ROOT)' '$*' \ - < $(TARBALL_DIR)/cactus-flesh-source.files && \ + < $(TARBALL_DIR)/cactus-thorn-source-$*.files && \ : rm $(TARBALL_DIR)/cactus-thorn-source-$*.files2 && \ : > $@; \ } || echo "Formaline: WARNING: Error while adding thorn $* to git repository" |