incubator-airflow git commit: [AIRFLOW-75] Fix bug in S3 config file parsing

[cr...@apache.org]

Repository: incubator-airflow
Updated Branches:
  refs/heads/master 181d37321 -> eb0960975


[AIRFLOW-75] Fix bug in S3 config file parsing


Project: http://git-wip-us.apache.org/repos/asf/incubator-airflow/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-airflow/commit/eb096097
Tree: http://git-wip-us.apache.org/repos/asf/incubator-airflow/tree/eb096097
Diff: http://git-wip-us.apache.org/repos/asf/incubator-airflow/diff/eb096097

Branch: refs/heads/master
Commit: eb0960975181775e09bcf6098fc7e510a49db3d6
Parents: 181d373
Author: apapanico <al...@gmail.com>
Authored: Sun May 8 13:23:18 2016 -0700
Committer: Chris Riccomini <ch...@wepay.com>
Committed: Mon May 9 10:40:06 2016 -0700

----------------------------------------------------------------------
 airflow/hooks/S3_hook.py | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-airflow/blob/eb096097/airflow/hooks/S3_hook.py
----------------------------------------------------------------------
diff --git a/airflow/hooks/S3_hook.py b/airflow/hooks/S3_hook.py
index 90efd95..2b8d3db 100644
--- a/airflow/hooks/S3_hook.py
+++ b/airflow/hooks/S3_hook.py
@@ -52,6 +52,8 @@ def _parse_s3_config(config_file_name, config_format='boto', profile=None):
     else:
         raise AirflowException("Couldn't read {0}".format(config_file_name))
     # Setting option names depending on file format
+    if config_format is None:
+        config_format = 'boto'
     conf_format = config_format.lower()
     if conf_format == 'boto':  # pragma: no cover
         if profile is not None and 'profile ' + profile in sections: