Skip to content

Commit

Permalink
flow test fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
petersilva committed Apr 17, 2021
1 parent b2188c3 commit 44fb40d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 3 deletions.
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
metpx-sarracenia (2.21.03post2) stable; urgency=medium

*bugfix running on windows... again for #47, but not resolving #47

-- Peter Silva <peter@fractal> Tue, 23 Mar 2021 13:33:39 -0400

metpx-sarracenia (2.21.03p1) stable; urgency=medium

* bugfix... problem reported in #47, but not resolving #47.
Expand Down
2 changes: 1 addition & 1 deletion generate-win-installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ cd pynsist_pkgs/
pip3 download pynacl --only-binary=:all: --platform win_amd64
pip3 download amqp --only-binary=:all: --platform win_amd64
pip3 download appdirs --only-binary=:all: --platform win_amd64
#pip3 download netifaces-w38 --only-binary=:all: --platform win_amd64
pip3 download netifaces --only-binary=:all: --platform win_amd64
pip3 download pika --only-binary=:all: --platform win_amd64
pip3 download psutil --only-binary=:all: --platform win_amd64
pip3 download paramiko --only-binary=:all: --platform win_amd64

Expand Down
2 changes: 1 addition & 1 deletion sarra/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#
__version__ = "2.21.03p1"
__version__ = "2.21.03post2"
5 changes: 4 additions & 1 deletion sarra/plugins/msg_pclean_f92.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class Msg_Clean_F92(Msg_Pclean):
def on_message(self, parent):
import os

parent.logger.info("msg_pclean_f92.py on_message")
parent.logger.info("msg_pclean_f92.py on_message %s" % parent.msg.relpath )

result = True
msg_relpath = parent.msg.relpath
Expand All @@ -24,6 +24,7 @@ def on_message(self, parent):
f20_path = f20_path.replace(ext, '')
try:
os.unlink(f20_path)
parent.logger.info("unlinked 1 {}".format(f20_path))
except FileNotFoundError as err:
parent.logger.error("could not unlink in {}: {}".format(f20_path, err))
parent.logger.debug("Exception details:", exc_info=True)
Expand All @@ -33,8 +34,10 @@ def on_message(self, parent):
for fxx_dir, path in path_dict.items():
try:
os.unlink(path)
parent.logger.info("unlinked 2 {}".format(path))
if ext != '.moved':
os.unlink(path.replace(ext, ''))
parent.logger.info("unlinked 3 {}".format(path.replace(ext,'')))
except OSError as err:
parent.logger.error("could not unlink in {}: {}".format(fxx_dir, err))
parent.logger.debug("Exception details:", exc_info=True)
Expand Down

0 comments on commit 44fb40d

Please sign in to comment.