Merge branch 'move-exclude-device-files' into dev

This commit is contained in:
zertrin 2015-04-21 00:10:46 +02:00
commit e976b5def9

View file

@ -212,7 +212,7 @@ elif [ "$ENCRYPTION" = "no" ]; then
ENCRYPT="--no-encryption" ENCRYPT="--no-encryption"
fi fi
NO_S3CMD="WARNING: s3cmd no found in PATH, remote file \ NO_S3CMD="WARNING: s3cmd not found in PATH, remote file \
size information unavailable." size information unavailable."
NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \ NO_S3CMD_CFG="WARNING: s3cmd is not configured, run 's3cmd --configure' \
in order to retrieve remote file size information. Remote file \ in order to retrieve remote file size information. Remote file \
@ -453,7 +453,7 @@ include_exclude()
# Exlcude device files? # Exlcude device files?
if [ ! -z $EXDEVICEFILES ] && [ $EXDEVICEFILES -ne 0 ]; then if [ ! -z $EXDEVICEFILES ] && [ $EXDEVICEFILES -ne 0 ]; then
TMP=" --exclude-device-files" TMP=" --exclude-device-files"
INCLUDE=$INCLUDE$TMP EXCLUDE=$EXCLUDE$TMP
fi fi
for include in ${INCLIST[@]} for include in ${INCLIST[@]}