Mercurial > libervia-backend

changeset 2883:7e8ca7c1429a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
jp (avatar/get): fixed avatar being displayed 2 times in a corner case: when avatar is shown by ImageMagick's display and it is terminated using SIGINT, the return code is 2 and not 0. Before this patch, jp was interpreting the 2 as an image not displayed and so was trying with the next available command Now it is stopping when exit code 2 is received.
author Goffi <goffi@goffi.org>
date Fri, 05 Apr 2019 21:22:05 +0200
parents 0c54970d8e6e
children 368a60f05d0e
files sat_frontends/jp/cmd_avatar.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/sat_frontends/jp/cmd_avatar.py	Fri Apr 05 21:22:03 2019 +0200
+++ b/sat_frontends/jp/cmd_avatar.py	Fri Apr 05 21:22:05 2019 +0200
@@ -88,7 +88,8 @@
             except OSError:
                 pass
             else:
-                if ret == 0:
+                if ret in (0, 2):
+                    # we can get exit code 2 with display when stopping it with C-c
                     break
         else:
             # didn't worked with commands, we try our luck with webbrowser