Merge commit 'refs/pull/987/head' of github.com:openSUSE/osc

Handle SIGWINCH more gracefully. This is also needed to work
around an issue in m2crypto (see the discussion [1]).

[1] https://github.com/openSUSE/osc/pull/987

osc/babysitter.py

@@ -57,9 +57,6 @@ for name in 'SIGBREAK', 'SIGHUP', 'SIGTERM':
     if num:
         signal.signal(num, catchterm)
 
-# Signals which should be ignored
-for sig in (signal.SIGWINCH,):
-    signal.signal(sig, signal.SIG_IGN)
 
 def run(prg, argv=None):
     try:

osc/meter.py

@@ -3,6 +3,9 @@
 # and distributed under the terms of the GNU General Public Licence,
 # either version 2, or (at your option) any later version.
 
+
+import signal
+
 try:
     import progressbar as pb
     have_pb_module = True
@@ -23,6 +26,11 @@ class PBTextMeter(object):
                 # a ZeroDivisionException
                 widgets.insert(1, pb.Percentage())
             self.bar = pb.ProgressBar(widgets=widgets, maxval=size)
+        # When a signal handler is set, it resets SA_RESTART flag
+        # - see signal.siginterrupt() python docs.
+        # ProgressBar's constructor sets signal handler for SIGWINCH.
+        # So let's make sure that it doesn't interrupt syscalls in osc.
+        signal.siginterrupt(signal.SIGWINCH, False)
         self.bar.start()
 
     def update(self, amount_read):