From: Uwe Kleine-König Date: Thu, 5 Mar 2009 09:19:05 +0000 (+0100) Subject: make removing quilt patches dir more robust X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topgit.git;a=commitdiff_plain;h=f8bf6e55c2ea49ac0b3299a30034f349f1776ea2;ds=sidebyside make removing quilt patches dir more robust This way errors only occur if something goes really wrong, so don't feed to /dev/null and don't ignore non-zero exit status. Signed-off-by: Uwe Kleine-König Acked-by: martin f. krafft --- diff --git a/debian/tg2quilt.mk b/debian/tg2quilt.mk index 66e9d41..4ec27e2 100644 --- a/debian/tg2quilt.mk +++ b/debian/tg2quilt.mk @@ -122,7 +122,7 @@ else # remove the series file test -f $(QUILT_PATCH_DIR)/series && rm $(QUILT_PATCH_DIR)/series || : # try to remove directories - find $(QUILT_PATCH_DIR) -type d | tac | xargs rmdir 2>/dev/null || : + find $(QUILT_PATCH_DIR) -depth -type d -empty -execdir rmdir {} + # fail if the directory could not be removed and still exists @test ! -d $(QUILT_PATCH_DIR) || { \ echo "E: $(QUILT_PATCH_DIR) contains non-TopGit-generated files:" >&2; \