revpi/revpipyload
1
0
Fork 0
mirror of https://github.com/naruxde/revpipyload.git synced 2025-11-08 15:13:52 +01:00
Code Issues Packages Releases Wiki Activity

Bugfix - Do not remove empty plcworkdir on xml_plcdelete_file function

Browse Source
This commit is contained in:
Sven Sager
2020-12-28 23:11:38 +01:00
parent acd61bc2df
commit a6d794c78e
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
revpipyload/revpipyload.py
View File

@@ -1078,11 +1078,13 @@ class RevPiPyLoad:
file_name = os.path.join(self.plcworkdir, file_name) file_name = os.path.join(self.plcworkdir, file_name)
if os.path.exists(file_name): if os.path.exists(file_name):
os.remove(file_name) os.remove(file_name)
try: dirname = os.path.dirname(file_name)
# Try to remove directory if empty if dirname != self.plcworkdir:
os.rmdir(os.path.dirname(file_name)) try:
except Exception: # Try to remove directory, which will work if it is empty
pass os.rmdir(dirname)
except Exception:
pass
return True return True
return False return False
@@ -1197,6 +1199,9 @@ class RevPiPyLoad:
# Build absolut path, join will return last element, if absolute # Build absolut path, join will return last element, if absolute
dirname = os.path.join(self.plcworkdir, os.path.dirname(filename)) dirname = os.path.join(self.plcworkdir, os.path.dirname(filename))
if os.path.abspath(dirname).find(self.plcworkdir) != 0: if os.path.abspath(dirname).find(self.plcworkdir) != 0:
proginit.logger.warning(
"file path is not in plc working directory"
)
return False return False
set_uid = self.plcuid if self.plcworkdir_set_uid else 0 set_uid = self.plcuid if self.plcworkdir_set_uid else 0