Changeset c017b0 in indico

Timestamp:

02/07/12 17:00:41 (16 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

bd79fe

Parents:

f345ad

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (02/07/12 16:59:19)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (02/07/12 17:00:41)

Message:

[FIX] Duplicate file delete after request

• In case of conflict the file would be added twice to the list and

Indico would try to delete it twice at the end of the request.

File:

• indico/MaKaC/webinterface/rh/conferenceBase.py (modified) (2 diffs)

indico/MaKaC/webinterface/rh/conferenceBase.py

@@ -210 +210 @@
                 shutil.copyfileobj(fd, f)
             self._tempFiles[fd] = fileName
+            # queue file for deletion at end of request
+            self._tempFilesToDelete.append(fileName)
         return self._tempFiles[fd]
 
@@ -263 +265 @@
                         fDict["filePath"] = self._saveFileToTemp(fileUpload.file)
                         fDict["size"] = os.path.getsize(fDict["filePath"])
-                        self._tempFilesToDelete.append(fDict["filePath"])
 
                     self._setErrorList(fDict)