Merge "sql.php in interactive no more exit on DBerror"

diff --git a/maintenance/sql.php b/maintenance/sql.php
index 04e98d9..e8e8cb4 100644 (file)
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -80,7 +80,8 @@ class MwSql extends Maintenance {
                                $this->sqlPrintResult( $res, $dbw );
                                $wholeLine = '';
                        } catch (DBQueryError $e) {
-                               $this->error( $e, true );
+                               $doDie = ! Maintenance::posix_isatty( 0 );
+                               $this->error( $e, $doDie );
                        }
                }
        }