diff --git a/lib/core/common.py b/lib/core/common.py index 9d19ff8b9..2e5733f6f 100644 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1352,7 +1352,7 @@ def normalizePath(filepath): retVal = filepath if retVal: - retVal = retVal.strip("\r").strip("\n") + retVal = retVal.strip("\r\n") retVal = ntpath.normpath(retVal) if isWindowsDriveLetterPath(retVal) else posixpath.normpath(retVal) return retVal diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py index 7ced5df0a..e9ea439f1 100644 --- a/plugins/generic/filesystem.py +++ b/plugins/generic/filesystem.py @@ -65,7 +65,7 @@ class Filesystem: if localFileSize == remoteFileSize: sameFile = True infoMsg = "the local file %s and the remote file " % localFile - infoMsg += "%s have the same size" % remoteFile + infoMsg += "%s has the same size" % remoteFile elif remoteFileSize > localFileSize: infoMsg = "the remote file %s is larger than " % remoteFile infoMsg += "the local file %s" % localFile