diff options
| author | Brice Goglin <Brice.Goglin@ens-lyon.org> | 2007-07-09 19:06:05 +0200 |
|---|---|---|
| committer | Brice Goglin <Brice.Goglin@ens-lyon.org> | 2007-07-09 19:06:05 +0200 |
| commit | 16d97b30b91da02d5a3edc2b895cbd4a1995f62d (patch) | |
| tree | 07ab2c60ce157c10580e90fb3750ec6fe8d31a36 | |
| parent | 271778bd6338575afa3e4ae7f614f38cdff8e2fb (diff) | |
| download | xutils-dev-16d97b30b91da02d5a3edc2b895cbd4a1995f62d.tar.gz | |
Fix displaying of patches applied by quilt.
As requested in bug #428090, we silence the output of quilt next
and display the output of quilt push/pop.
| -rwxr-xr-x | debian/xsfbs/xsfbs.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 63dde45..2930c1e 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -140,9 +140,9 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \ exit 1; \ fi; \ - if quilt next; then \ + if quilt next >/dev/null 2>&1; then \ echo -n "Applying patches..."; \ - if quilt push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \ + if quilt push -a -v 2>&1 | tee $(STAMP_DIR)/log/patch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \ @@ -159,7 +159,7 @@ unpatch: rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \ - if quilt pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \ + if quilt pop -a -v 2>&1 | tee $(STAMP_DIR)/log/unpatch; then \ echo "successful."; \ else \ echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \ |