From b48d96a65e576123945bceec429eea7c899df699 Mon Sep 17 00:00:00 2001
From: Alan Post <alanpost@sunflowerriver.org>
Date: Sat, 9 Oct 2010 10:41:05 -0600
Subject: [PATCH] separate conditions rather than ignoring error,  thx @werner

I've checked the rest of include/ for other cases of this error, but
didn't find any.
---
 include/quilt.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/quilt.mk b/include/quilt.mk
index 598c6f8e1..2b27de82d 100644
--- a/include/quilt.mk
+++ b/include/quilt.mk
@@ -39,7 +39,7 @@ define PatchDir/Quilt
 endef
 
 define PatchDir/Default
-	@if [ -d "$(2)" -a "$$$$(ls $(2) 2>/dev/null | wc -l)" -gt 0 ]; then \
+	@if [ -d "$(2)" ] && [ "$$$$(ls $(2) | wc -l)" -gt 0 ]; then \
 		if [ -s "$(2)/series" ]; then \
 			$(call filter_series,$(2)/series) | xargs -n1 \
 				$(PATCH) "$(1)" "$(2)"; \