merge quilt return code checks from trunk to 8.09
authorFelix Fietkau <nbd@openwrt.org>
Thu, 28 May 2009 16:17:16 +0000 (16:17 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 28 May 2009 16:17:16 +0000 (16:17 +0000)
SVN-Revision: 16146

include/quilt.mk

index 70bc84e..d7342c9 100644 (file)
@@ -128,7 +128,7 @@ define Build/Quilt
 
   $(STAMP_CONFIGURED): $(STAMP_CHECKED) FORCE
   $(STAMP_CHECKED): $(STAMP_PATCHED)
-       if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); quilt next >/dev/null 2>&1 && quilt push -a || quilt top >/dev/null 2>&1); fi
+       if [ -s "$(PKG_BUILD_DIR)/patches/series" ]; then (cd $(PKG_BUILD_DIR); if quilt next >/dev/null 2>&1; then quilt push -a; else quilt top >/dev/null 2>&1; fi); fi
        touch $$@
 
   quilt-check: $(STAMP_PREPARED) FORCE