[Armadeus-commitlog] armadeus branch, master, updated. armadeus-6.0-386-gb4b5b92
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@sf...> - 2018-03-05 15:43:51
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via b4b5b92128593ca2b766575e3a9a1ef87e348ce7 (commit)
from b7bca5e486ae5a9dab8b59d69f7a36ebcff86411 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b4b5b92128593ca2b766575e3a9a1ef87e348ce7
Author: Julien BOIBESSOT <jul...@ar...>
Date: Fri Mar 2 18:30:51 2018 +0100
[TOOLS] Fixes scripts/quiltify.sh when no filtered patches are found
-----------------------------------------------------------------------
Summary of changes:
scripts/quiltify.sh | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index 7a57ec3..846c763 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -191,11 +191,16 @@ fi
mkdir patches
if [ "$QUILT_PATCH_FILTER" != "" ]; then
PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch | grep $QUILT_PATCH_FILTER`
+ if [ "$PATCHES" == "" ]; then
+ # No filtered patches, try normal ones
+ PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
+ fi
else
PATCHES=`ls -ar $QUILT_TARGET_PATCH_DIR/*.patch`
fi
for patch in $PATCHES; do
+ echo ">>> Importing patch $patch"
quilt import $patch
done
hooks/post-receive
--
armadeus
|