# HG changeset patch # User Edouard Tisserant # Date 1608645479 -3600 # Node ID fc5a0b1ece1071e35c5ee5d1f3f613acdeb5fe1b # Parent dbb9d1898874a6da6ca745bdad3cef55de0f54a2# Parent f0a70f0246da513a001570545430ff85c8eafffa Merged default in svghmi branch diff -r dbb9d1898874 -r fc5a0b1ece10 runtime/PLCObject.py --- a/runtime/PLCObject.py Mon Dec 21 11:10:27 2020 +0100 +++ b/runtime/PLCObject.py Tue Dec 22 14:57:59 2020 +0100 @@ -555,12 +555,15 @@ os.close(fd) self._init_blobs() - def _BlobAsFile(self, blobID, newpath): + def BlobAsFile(self, blobID, newpath): blob = self.blobs.pop(blobID, None) if blob is None: raise Exception(_("Missing data to create file: {}").format(newpath)) + self._BlobAsFile(blob, newpath) + + def _BlobAsFile(self, blob, newpath): fd, path, _md5sum = blob fobj = os.fdopen(fd) fobj.flush() @@ -619,13 +622,13 @@ try: # Create new PLC file - self._BlobAsFile(plc_object, new_PLC_filename) + self.BlobAsFile(plc_object, new_PLC_filename) # Then write the files log = open(extra_files_log, "w") for fname, blobID in extrafiles: fpath = os.path.join(self.workingdir, fname) - self._BlobAsFile(blobID, fpath) + self.BlobAsFile(blobID, fpath) log.write(fname+'\n') # Store new PLC filename based on md5 key