[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20171008-7-gb9a9770

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=b9a9770ff4e72baa6005a10e705d973db48db5a9

commit b9a9770ff4e72baa6005a10e705d973db48db5a9
Author: Jon Turney <[email protected]>
Date:   Thu Nov 2 13:35:21 2017 +0000

    Also ignore OSError when trying to connect to irked
    
    This seems to happen on Travis, now

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=26dcc93366001ef916f39ef34c31e08d8f3ed65a

commit 26dcc93366001ef916f39ef34c31e08d8f3ed65a
Author: Yaakov Selkowitz <[email protected]>
Date:   Thu Nov 2 12:16:59 2017 +0000

    Update past_mistakes.py


Diff:
---
 calm/irk.py           |    2 +-
 calm/past_mistakes.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/calm/irk.py b/calm/irk.py
index 47cb112..7e425ef 100755
--- a/calm/irk.py
+++ b/calm/irk.py
@@ -34,7 +34,7 @@ def irk(message, target=DEFAULT_TARGET, server=DEFAULT_SERVER):
         send(s, target, message)
 
         s.close()
-    except ConnectionRefusedError:
+    except (ConnectionRefusedError, OSError):
         pass
 
 
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 16ba212..8298f5f 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -130,6 +130,8 @@ nonunique_versions = [
     'libical_cxx-devel',
     'libquota-devel',             # no longer provided by e2fsprogs
     'libturbojpeg',               # no number means it isn't considered an old soversion
+    'libtxc_dxtn',                # split out from s2tc
+    'libtxc_dxtn-devel',          # split out from s2tc
     'mingw64-i686-spice-gtk2.0',  # gtk2 dropped from spice-gtk
     'mingw64-x86_64-spice-gtk2.0',  # gtk2 dropped from spice-gtk
     'minizip',