jcarr
/
x11-xserver-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix "display the output of quilt push/pop". 

Fix commit 16d97b30b9 to check the
return value of quilt, not the one of tee.
This commit is contained in:
Brice Goglin 2007-07-12 16:06:22 +02:00
parent e29b568209
commit 12a633f722
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/xsfbs/xsfbs.mk vendored
View File

@ -147,9 +147,11 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
fi; \ fi; \
if $(QUILT) next >/dev/null 2>&1; then \ if $(QUILT) next >/dev/null 2>&1; then \
echo -n "Applying patches..."; \ echo -n "Applying patches..."; \
if $(QUILT) push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
cat $(STAMP_DIR)/log/patch; \
echo "successful."; \ echo "successful."; \
else \ else \
cat $(STAMP_DIR)/log/patch; \
echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
exit 1; \ exit 1; \
fi; \ fi; \
@ -164,9 +166,11 @@ unpatch:
rm -f $(STAMP_DIR)/patch rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \ @echo -n "Unapplying patches..."; \
if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
if $(QUILT) pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \ echo "successful."; \
else \ else \
cat $(STAMP_DIR)/log/unpatch; \
echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
exit 1; \ exit 1; \
fi; \ fi; \