From 63c014c5df1725340f6520d399b726d88bbf75f4 Mon Sep 17 00:00:00 2001 From: Akira Naru Takizawa Date: Sun, 29 Dec 2019 13:33:50 +0100 Subject: [PATCH] Fix error in piCtory checker Removed postinst message for upgrade from 0.6.5 --- debian/postinst | 13 ------------- revpipyload/revpipyload.py | 8 +++++--- setup.py | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/debian/postinst b/debian/postinst index 44a3bba..c0d835e 100755 --- a/debian/postinst +++ b/debian/postinst @@ -6,19 +6,6 @@ PATH=/bin:/sbin:/usr/bin:/usr/sbin case "$1" in configure) - cat <<-END - - ======= Important RevPiPyLoad post-installation note ======= - - If you upgrade from pre 0.6.5 Version,you have to migrate to the - new config file format!!! - /etc/revpipyload/revpipyload.conf - - READ: - DE: https://revpimodio.org/revpipyplc-auf-065/ - EN: https://revpimodio.org/en/revpipyplc-to-065/ - - END ;; esac diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py index c050fea..ab98de9 100755 --- a/revpipyload/revpipyload.py +++ b/revpipyload/revpipyload.py @@ -614,7 +614,7 @@ class RevPiPyLoad(): return False self.pictorymtime = mtime - # TODO: Nur "Devices" list vergleich + # TODO: Nur "Devices" list vergleich da HASH immer neu wegen timestmap with open(proginit.pargs.configrsc, "rb") as fh: file_hash = md5(fh.read()).digest() @@ -755,14 +755,16 @@ class RevPiPyLoad(): file_changed = True # Alle Verbindungen von ProcImgServer trennen - self.th_plcslave.disconnect_all() + if self.plcslave and self.th_plcslave is not None: + self.th_plcslave.disconnect_all() proginit.logger.warning("piCtory configuration was changed") if self.check_replace_ios_changed(): if not file_changed: # Verbindungen von ProcImgServer trennen mit replace_ios - self.th_plcslave.disconnect_replace_ios() + if self.plcslave and self.th_plcslave is not None: + self.th_plcslave.disconnect_replace_ios() file_changed = True proginit.logger.warning("replace ios file was changed") diff --git a/setup.py b/setup.py index f889fa1..50a2878 100644 --- a/setup.py +++ b/setup.py @@ -27,7 +27,7 @@ setup( license="LGPLv3", name="revpipyload", - version="0.8.1", + version="0.8.2", scripts=["data/revpipyload"],