diff options
| author |   Brian Dolbec <dolsen@gentoo.org> | 2018-01-15 17:05:11 -0800 |
|---|---|---|
| committer | Brian Dolbec <dolsen@gentoo.org> | 2018-01-16 09:41:38 -0800 |
| commit | 49514530a8d66c0078302b3363bf2d9f825bbcb6 (patch) | |
| tree | 7aee9996e75fd7c6097a8320b47744bfc8333791 /dev-util/buildbot/files | |
| parent | virtualbox packages: Removed old. (diff) | |
| download | gentoo-49514530a8d66c0078302b3363bf2d9f825bbcb6.tar.gz gentoo-49514530a8d66c0078302b3363bf2d9f825bbcb6.tar.bz2 gentoo-49514530a8d66c0078302b3363bf2d9f825bbcb6.zip | |
dev-util/buildbot: Version bump, update 9999 ebuild
Package-Manager: Portage-2.3.16, Repoman-2.3.6
Diffstat (limited to 'dev-util/buildbot/files')
| -rw-r--r-- | dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch new file mode 100644 index 000000000000..db08d7a45dd3 --- /dev/null +++ b/dev-util/buildbot/files/buildbot-0.9.15_p1-buildbotworkerdocker.py.patch @@ -0,0 +1,32 @@ +From 7051ebdac8c8a9054e8a37ab7dd8fb6f0ac1affb Mon Sep 17 00:00:00 2001 +From: Brian Dolbec <dolsen@gentoo.org> +Date: Mon, 15 Jan 2018 13:50:36 -0800 +Subject: [PATCH] master/buildbot/worker/docker.py: Fix test fail when docker + is not installed + +This fixes numerous tracebacks (note, only partial traceback): + + File "/usr/lib64/python3.6/site-packages/buildbot/worker/docker.py", line 259, in _thd_start_instance + if docker_py_version >= 2.2: +builtins.NameError: name 'docker_py_version' is not defined + +With this patch, the tests pass. +--- + master/buildbot/worker/docker.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/buildbot/worker/docker.py b/master/buildbot/worker/docker.py +index 62e30785f..e558d69ff 100644 +--- a/buildbot/worker/docker.py ++++ b/buildbot/worker/docker.py +@@ -41,6 +41,7 @@ try: + except ImportError: + docker = None + client = None ++ docker_py_version = 0.0 + + + def _handle_stream_line(line): +-- +2.15.1 + |