Repository: incubator-airflow Updated Branches: refs/heads/master 08a784ede -> 03704ce02
[AIRFLOW-1041] Do not shadow xcom_push method[] Closes #2274 from ludovicc/AIRFLOW-1041 Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/03704ce0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/03704ce0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/03704ce0 Branch: refs/heads/master Commit: 03704ce02608c7307fc7e55aa452892a0bdd137b Parents: 08a784e Author: Ludovic Claude <[email protected]> Authored: Sat May 13 13:25:57 2017 +0200 Committer: Bolke de Bruin <[email protected]> Committed: Sat May 13 13:25:57 2017 +0200 ---------------------------------------------------------------------- airflow/operators/docker_operator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/03704ce0/airflow/operators/docker_operator.py ---------------------------------------------------------------------- diff --git a/airflow/operators/docker_operator.py b/airflow/operators/docker_operator.py index 2fd7484..bca604c 100644 --- a/airflow/operators/docker_operator.py +++ b/airflow/operators/docker_operator.py @@ -122,7 +122,7 @@ class DockerOperator(BaseOperator): self.tmp_dir = tmp_dir self.user = user self.volumes = volumes or [] - self.xcom_push = xcom_push + self.xcom_push_flag = xcom_push self.xcom_all = xcom_all self.cli = None @@ -184,7 +184,7 @@ class DockerOperator(BaseOperator): if exit_code != 0: raise AirflowException('docker container failed') - if self.xcom_push: + if self.xcom_push_flag: return self.cli.logs(container=self.container['Id']) if self.xcom_all else str(line) def get_command(self):
