diff options
Diffstat (limited to 'meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch')
-rw-r--r-- | meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch index 5605950..928c0fb 100644 --- a/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch +++ b/meta-openstack/recipes-devtools/python/python-keystone/keystone-remove-git-commands-in-tests.patch | |||
@@ -17,11 +17,11 @@ Signed-off-by: Keith Holman <Keith.Holman@windriver.com> | |||
17 | keystone/tests/core.py | 2 ++ | 17 | keystone/tests/core.py | 2 ++ |
18 | 1 file changed, 2 insertions(+) | 18 | 1 file changed, 2 insertions(+) |
19 | 19 | ||
20 | diff --git a/keystone/tests/core.py b/keystone/tests/core.py | 20 | Index: git/keystone/tests/core.py |
21 | index 860f68d..9aa54db 100644 | 21 | =================================================================== |
22 | --- a/keystone/tests/core.py | 22 | --- git.orig/keystone/tests/core.py |
23 | +++ b/keystone/tests/core.py | 23 | +++ git/keystone/tests/core.py |
24 | @@ -109,6 +109,7 @@ def checkout_vendor(repo, rev): | 24 | @@ -125,6 +125,7 @@ |
25 | 25 | ||
26 | working_dir = os.getcwd() | 26 | working_dir = os.getcwd() |
27 | revdir = os.path.join(VENDOR, '%s-%s' % (name, rev.replace('/', '_'))) | 27 | revdir = os.path.join(VENDOR, '%s-%s' % (name, rev.replace('/', '_'))) |
@@ -29,14 +29,11 @@ index 860f68d..9aa54db 100644 | |||
29 | modcheck = os.path.join(VENDOR, '.%s-%s' % (name, rev.replace('/', '_'))) | 29 | modcheck = os.path.join(VENDOR, '.%s-%s' % (name, rev.replace('/', '_'))) |
30 | try: | 30 | try: |
31 | if os.path.exists(modcheck): | 31 | if os.path.exists(modcheck): |
32 | @@ -129,6 +130,7 @@ def checkout_vendor(repo, rev): | 32 | @@ -145,6 +146,7 @@ |
33 | fd.write('1') | 33 | fd.write('1') |
34 | except environment.subprocess.CalledProcessError: | 34 | except environment.subprocess.CalledProcessError: |
35 | LOG.warning(_('Failed to checkout %s'), repo) | 35 | LOG.warning(_('Failed to checkout %s'), repo) |
36 | + """ | 36 | + """ |
37 | cd(working_dir) | 37 | os.chdir(working_dir) |
38 | return revdir | 38 | return revdir |
39 | 39 | ||
40 | -- | ||
41 | 1.9.3 | ||
42 | |||