From 0d9fb53cf7647a2fb932c0410b327655f7831285 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Sun, 27 Dec 2015 21:40:54 +0100 Subject: [PATCH] This error message came from php-fuse (latest build) + updated 'core'. Signed-off-by: Roland Haeder --- contrib/find-bad-php.sh | 4 ++-- core | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/find-bad-php.sh b/contrib/find-bad-php.sh index 2fdfecf..85af1b2 100755 --- a/contrib/find-bad-php.sh +++ b/contrib/find-bad-php.sh @@ -1,7 +1,7 @@ #!/bin/sh echo "$0: Searching for PHP scripts (except 3rd party) ..." -PHP=`find -type f -name "*.php" | grep -v "third_party"` +PHP=`find -type f -name "*.php" 2>&1 | grep -v "third_party"` for SCRIPT in ${PHP}; do @@ -19,7 +19,7 @@ do echo "$0: Script '${SCRIPT}' has non-typical footer." fi - LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "No syntax errors detected in"` + LINT=`php -l "${SCRIPT}" 2>&1 | grep -v "Constant FUSE_EDEADLK already defined in Unknown on line 0" | grep -v "No syntax errors detected in"` if [ -n "${LINT}" ] then diff --git a/core b/core index 9409947..5b9ee45 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 940994747eea52b7de56abfffca5b2c33ae9b9dd +Subproject commit 5b9ee459776eeca35b67ac5643e0bffefbbf5dda -- 2.39.5