- globally ignore broken pipe

osc/babysitter.py

@@ -126,6 +126,12 @@ def run(prg):
         print >>sys.stderr, 'Failed to reach a server:\n', e.reason
         return 1
 
+    except IOError, e:
+        # ignore broken pipe
+        if e.errno != 32:
+            raise
+        return 1
+
     except (oscerr.ConfigError, oscerr.NoConfigfile), e:
         print >>sys.stderr, e.msg
         return 1
@@ -160,6 +166,7 @@ def run(prg):
             'and the following traceback to it:'
         print >>sys.stderr, e.msg
         traceback.print_exc(file=sys.stderr)
+        return 1
 
     except oscerr.PackageError, e:
         print >>sys.stderr, e.msg

osc/commandline.py

@@ -5721,7 +5721,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
             query['rev'] = show_upstream_srcmd5(apiurl, args[0], args[1], expand=True, revision=opts.revision)
         u = makeurl(apiurl, ['source', args[0], args[1], args[2]], query=query)
         try:
-            if subcmd == "less":
+            if subcmd == 'less':
                 f = http_GET(u)
                 run_pager(''.join(f.readlines()))
             else:
@@ -5736,16 +5736,11 @@ Please submit there instead, or use --nodevelproject to force direct submission.
                     f = http_GET(u)
                     run_pager(''.join(f.readlines()))
                 else:
-                    try:
-                        for data in streamfile(u):
-                            sys.stdout.write(data)
-                    except IOError, e:
-                        pass # Ignore broken pipe, i.e. when used like 'osc cat foo | head'
+                    for data in streamfile(u):
+                        sys.stdout.write(data)
             else:
                 e.osc_msg = 'If linked, try: cat -e'
                 raise e
-        except IOError, e:
-            pass # Ignore broken pipe, i.e. when used like 'osc cat foo | head'
 
 
     # helper function to download a file from a specific revision