- globally catch OSError ENOENT

osc/babysitter.py

@@ -133,6 +133,12 @@ def run(prg):
             raise
         return 1
 
+    except OSError, e:
+        if e.errno != errno.ENOENT:
+            raise
+        print >>sys.stderr, e
+        return 1
+
     except (oscerr.ConfigError, oscerr.NoConfigfile), e:
         print >>sys.stderr, e.msg
         return 1

osc/build.py

@@ -865,10 +865,6 @@ def main(apiurl, opts, argv):
         print "keyboard interrupt, killing build ..."
         subprocess.call(cmd + ["--kill"])
         raise i
-    except Exception, e:
-        # 'No such file or directory' should not trigger a stack trace
-        print "Exception: " + str(e)
-        sys.exit(1)
 
     pacdir = os.path.join(build_root, '.build.packages')
     if os.path.islink(pacdir):