Diff.scala in s3_website-2.1.3

- old
+ new
@@ -211,19 +211,19 @@
 
     private def reasonForUpload(truncatedKey: TruncatedDbRecord, databaseIndices: DbIndices, isUpdate: Boolean) = {
       if (isUpdate) {
         val lengthChanged = !(databaseIndices.fileLenghtIndex contains truncatedKey.fileLength)
         val mtimeChanged = !(databaseIndices.lastModifiedIndex contains truncatedKey.fileModified)
-        if (lengthChanged)
-          "file length has changed according to the local database"
+        if (mtimeChanged && lengthChanged)
+          "file mtime and length have changed"
+        else if (lengthChanged)
+          "file length has changed"
         else if (mtimeChanged)
-          "file mtime has changed according to the local database"
-        else if (mtimeChanged && lengthChanged)
-          "file mtime and length have changed according to the local database"
+          "file mtime has changed"
         else
           "programmer error: faulty logic in inferring the reason for upload"
       }
-      else "file is new according to the local database"
+      else "file is new according"
     }
 
     private def getOrCreateDbFile(implicit site: Site, logger: Logger) =
       Try {
         val dbFile = new File(getTempDirectory, "s3_website_local_db_" + sha256Hex(site.rootDirectory))
\ No newline at end of file