Merge branch '5.1.10'

# Conflicts:
#	Shorewall/lib.cli-std
This commit is contained in:
Tom Eastep 2017-12-31 14:06:52 -08:00
commit 4f50303318
No known key found for this signature in database
GPG Key ID: 96E6B3F2423A4D10

View File

@ -382,14 +382,22 @@ uptodate() {
local dir local dir
local ifs local ifs
if [ -n "$g_shorewalldir" ]; then
if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
return 1;
fi
fi
ifs="$IFS" ifs="$IFS"
IFS=':' IFS=':'
for dir in $g_shorewalldir $CONFIG_PATH; do for dir in $CONFIG_PATH; do
if [ -n "$(find ${dir} -mindepth 1 -maxdepth 1 -newer $1)" ]; then if [ -n "$dir" ]; then
if [ -n "$(find ${dir} -maxdepth 1 -newer $1)" ]; then
IFS="$ifs" IFS="$ifs"
return 1; return 1;
fi fi
fi
done done
IFS="$ifs" IFS="$ifs"