beremiz

Fix PLCObject's purge failing silently with extra_files.

2019-06-06, Edouard Tisserant
e05458405ff4
Parents 98eb3d1c56b0
Children 6b4061f6ced6
Fix PLCObject's purge failing silently with extra_files.
1 files changed, 10 insertions(+), 8 deletions(-)
  • +10 -8
    runtime/PLCObject.py
    • --- a/runtime/PLCObject.py Thu May 30 11:53:13 2019 +0200
    +++ b/runtime/PLCObject.py Thu Jun 06 14:03:16 2019 +0200
    @@ -560,18 +560,20 @@
    if self.CurrentPLCFilename is not None \
    else None
    - allfiles = [extra_files_log, old_PLC_filename, self._GetMD5FileName()]
    -
    try:
    - allfiles.append(open(extra_files_log, "rt").readlines())
    + allfiles = open(extra_files_log, "rt").readlines()
    + allfiles.extend([extra_files_log, old_PLC_filename, self._GetMD5FileName()])
    except Exception:
    - pass
    + self.LogMessage("No files to purge")
    + allfiles = []
    for filename in allfiles:
    - try:
    - os.remove(os.path.join(self.workingdir, filename.strip()))
    - except Exception:
    - pass
    + if filename:
    + filename = filename.strip()
    + try:
    + os.remove(os.path.join(self.workingdir, filename))
    + except Exception:
    + self.LogMessage("Couldn't purge " + filename)
    self.PLCStatus = PlcStatus.Empty