diff options
| author | Joshua Hesketh <josh@nitrotech.org> | 2016-07-14 00:12:25 +1000 |
|---|---|---|
| committer | Joshua Hesketh <josh@nitrotech.org> | 2016-07-14 22:36:59 +1000 |
| commit | 0aa7e8bdbf99b6da00ed6dcb17256c131386e5c3 (patch) | |
| tree | 814d7136044ff78e56f3737b15b59544f3e32425 /zuul/merger | |
| parent | bfa945a579a51317f773e136e9b81edd92993fba (diff) | |
| parent | c19d3d9eff8921d7a76abd58729a3acb08d3e1e5 (diff) | |
| download | zuul-0aa7e8bdbf99b6da00ed6dcb17256c131386e5c3.tar.gz | |
Merge branch 'master' into v3_merge
Includes minor py3 fixes (for pep8 on py3).
Conflicts:
tests/base.py
tests/test_model.py
tests/test_scheduler.py
tox.ini
zuul/model.py
zuul/reporter/__init__.py
zuul/scheduler.py
zuul/source/gerrit.py
Change-Id: I99daf9acd746767967b42396881a2dff82134a07
Diffstat (limited to 'zuul/merger')
| -rw-r--r-- | zuul/merger/merger.py | 2 | ||||
| -rw-r--r-- | zuul/merger/server.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/zuul/merger/merger.py b/zuul/merger/merger.py index 7c9f1f988..46fc46822 100644 --- a/zuul/merger/merger.py +++ b/zuul/merger/merger.py @@ -217,7 +217,7 @@ class Merger(object): fd.write('#!/bin/bash\n') fd.write('ssh -i %s $@\n' % key) fd.close() - os.chmod(name, 0755) + os.chmod(name, 0o755) def addProject(self, project, url): repo = None diff --git a/zuul/merger/server.py b/zuul/merger/server.py index 813c60241..44606e7af 100644 --- a/zuul/merger/server.py +++ b/zuul/merger/server.py @@ -19,7 +19,7 @@ import traceback import gear -import merger +from zuul.merger import merger class MergeServer(object): |