equal
deleted
inserted
replaced
558 |
558 |
559 old_PLC_filename = os.path.join(self.workingdir, self.CurrentPLCFilename) \ |
559 old_PLC_filename = os.path.join(self.workingdir, self.CurrentPLCFilename) \ |
560 if self.CurrentPLCFilename is not None \ |
560 if self.CurrentPLCFilename is not None \ |
561 else None |
561 else None |
562 |
562 |
563 allfiles = [extra_files_log, old_PLC_filename, self._GetMD5FileName()] |
|
564 |
|
565 try: |
563 try: |
566 allfiles.append(open(extra_files_log, "rt").readlines()) |
564 allfiles = open(extra_files_log, "rt").readlines() |
|
565 allfiles.extend([extra_files_log, old_PLC_filename, self._GetMD5FileName()]) |
567 except Exception: |
566 except Exception: |
568 pass |
567 self.LogMessage("No files to purge") |
|
568 allfiles = [] |
569 |
569 |
570 for filename in allfiles: |
570 for filename in allfiles: |
571 try: |
571 if filename: |
572 os.remove(os.path.join(self.workingdir, filename.strip())) |
572 filename = filename.strip() |
573 except Exception: |
573 try: |
574 pass |
574 os.remove(os.path.join(self.workingdir, filename)) |
|
575 except Exception: |
|
576 self.LogMessage("Couldn't purge " + filename) |
575 |
577 |
576 self.PLCStatus = PlcStatus.Empty |
578 self.PLCStatus = PlcStatus.Empty |
577 |
579 |
578 # TODO: PLCObject restart |
580 # TODO: PLCObject restart |
579 |
581 |