diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-04-21 23:15:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-04-21 23:15:11 +0000 |
| commit | a725ca89afa1f2f4492bf3535f9d8cd3f6ebe30e (patch) | |
| tree | 4379cc479ca1242aa194444db8ddf01d5df12f91 /jenkins_jobs/builder.py | |
| parent | 5d14a621a039a4adf96dfc232b69d0cb574d99be (diff) | |
| parent | e1f5dec356ea13d5f838926f939d95835d4b5873 (diff) | |
| download | python-jenkins-job-builder-a725ca89afa1f2f4492bf3535f9d8cd3f6ebe30e.tar.gz python-jenkins-job-builder-a725ca89afa1f2f4492bf3535f9d8cd3f6ebe30e.tar.xz python-jenkins-job-builder-a725ca89afa1f2f4492bf3535f9d8cd3f6ebe30e.zip | |
Merge "Wrap stdout object only once with wrap_stream"
Diffstat (limited to 'jenkins_jobs/builder.py')
| -rw-r--r-- | jenkins_jobs/builder.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/jenkins_jobs/builder.py b/jenkins_jobs/builder.py index 28901b5e..10861ef2 100644 --- a/jenkins_jobs/builder.py +++ b/jenkins_jobs/builder.py @@ -350,12 +350,15 @@ class Builder(object): raise if output: + # ensure only wrapped once + if hasattr(output, 'write'): + output = utils.wrap_stream(output) + for job in self.parser.xml_jobs: if hasattr(output, 'write'): # `output` is a file-like object logger.info("Job name: %s", job.name) logger.debug("Writing XML to '{0}'".format(output)) - output = utils.wrap_stream(output) try: output.write(job.output()) except IOError as exc: |