diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-09 10:57:26 -0400 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2015-03-09 10:57:26 -0400 |
commit | ff75c955954b32c1aa6fa301303e9df5ef53078e (patch) | |
tree | 85a2d2deeb12b289d4c729c4f5985fb72795fffd /meta-openstack/recipes-devtools/python/python-novnc | |
parent | 1bd3d61e2c24a8f404ee41fb291c401a9fc9c937 (diff) | |
download | meta-cloud-services-ff75c955954b32c1aa6fa301303e9df5ef53078e.tar.gz |
support libs: round2 refresh
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-novnc')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch b/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch index e8acded..ef3393f 100644 --- a/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch +++ b/meta-openstack/recipes-devtools/python/python-novnc/python-distutils.patch | |||
@@ -17,35 +17,3 @@ Index: git/setup.py | |||
17 | + package_dir = {'novnc':'utils'}, | 17 | + package_dir = {'novnc':'utils'}, |
18 | + py_modules=['wsproxy','websocket','web','json2graph','img2js'], | 18 | + py_modules=['wsproxy','websocket','web','json2graph','img2js'], |
19 | +) | 19 | +) |
20 | Index: git/utils/__init__.py | ||
21 | =================================================================== | ||
22 | --- /dev/null | ||
23 | +++ git/utils/__init__.py | ||
24 | @@ -0,0 +1 @@ | ||
25 | +# vim: tabstop=4 shiftwidth=4 softtabstop=4 | ||
26 | Index: git/utils/nova-novncproxy | ||
27 | =================================================================== | ||
28 | --- git.orig/utils/nova-novncproxy | ||
29 | +++ git/utils/nova-novncproxy | ||
30 | @@ -27,7 +27,7 @@ from oslo.config import cfg | ||
31 | import socket | ||
32 | import sys | ||
33 | |||
34 | -import websockify | ||
35 | +from novnc import wsproxy | ||
36 | |||
37 | from nova import config | ||
38 | from nova import context | ||
39 | Index: git/utils/websockify | ||
40 | =================================================================== | ||
41 | --- git.orig/utils/websockify | ||
42 | +++ git/utils/websockify | ||
43 | @@ -13,7 +13,7 @@ as taken from http://docs.python.org/dev | ||
44 | |||
45 | import signal, socket, optparse, time, os, sys, subprocess | ||
46 | from select import select | ||
47 | -import websocket | ||
48 | +from novnc import websocket | ||
49 | try: | ||
50 | from urllib.parse import parse_qs, urlparse | ||
51 | except: | ||