[airflow] branch master updated: Replace remaining uses of "bail" (#10217)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/master by this push:
     new 0d8bc95  Replace remaining uses of "bail" (#10217)
0d8bc95 is described below

commit 0d8bc95ad643924ebcad4da0d9ea36416e05d5e3
Author: Joe Lyman <Ly...@users.noreply.github.com>
AuthorDate: Sat Aug 8 13:33:39 2020 +0100

    Replace remaining uses of "bail" (#10217)
---
 airflow/cli/commands/dag_command.py | 2 +-
 airflow/cli/commands/db_command.py  | 2 +-
 airflow/models/dag.py               | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/airflow/cli/commands/dag_command.py b/airflow/cli/commands/dag_command.py
index e003f16..13dd351 100644
--- a/airflow/cli/commands/dag_command.py
+++ b/airflow/cli/commands/dag_command.py
@@ -176,7 +176,7 @@ def dag_delete(args):
         except OSError as err:
             raise AirflowException(err)
     else:
-        print("Bail.")
+        print("Cancelled")
 
 
 @cli_utils.action_logging
diff --git a/airflow/cli/commands/db_command.py b/airflow/cli/commands/db_command.py
index e384c4e..6ba5b37 100644
--- a/airflow/cli/commands/db_command.py
+++ b/airflow/cli/commands/db_command.py
@@ -40,7 +40,7 @@ def resetdb(args):
                          "(y/n)").upper() == "Y":
         db.resetdb()
     else:
-        print("Bail.")
+        print("Cancelled")
 
 
 @cli_utils.action_logging
diff --git a/airflow/models/dag.py b/airflow/models/dag.py
index 222910a..172ca19 100644
--- a/airflow/models/dag.py
+++ b/airflow/models/dag.py
@@ -929,7 +929,7 @@ class DAG(BaseDag, LoggingMixin):
             # graph as we move through it. We also keep a flag for
             # checking that that graph is acyclic, which is true if any
             # nodes are resolved during each pass through the graph. If
-            # not, we need to bail out as the graph therefore can't be
+            # not, we need to exit as the graph therefore can't be
             # sorted.
             acyclic = False
             for node in list(graph_unsorted.values()):
@@ -1154,7 +1154,7 @@ class DAG(BaseDag, LoggingMixin):
             )
         else:
             count = 0
-            print("Bail. Nothing was cleared.")
+            print("Cancelled, nothing was cleared.")
 
         session.commit()
         return count
@@ -1215,7 +1215,7 @@ class DAG(BaseDag, LoggingMixin):
                           )
         else:
             count = 0
-            print("Bail. Nothing was cleared.")
+            print("Cancelled, nothing was cleared.")
         return count
 
     def __deepcopy__(self, memo):