diff options
author | Christopher Clark <christopher.w.clark@gmail.com> | 2020-06-29 18:54:47 -0700 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-07-06 16:25:56 -0400 |
commit | 345505989ce65f2486aa3afdf325cc68c28f1d55 (patch) | |
tree | cee861990f2534e506d1c4a21729110d75e848d5 /recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch | |
parent | 8af29790eee317c3b1da3acd87b10659eaa914a7 (diff) | |
download | meta-virtualization-345505989ce65f2486aa3afdf325cc68c28f1d55.tar.gz |
xen, xen-tools: update revision to Xen 4.13
Pull to the current tip of the stable 4.13 branch and apply an upstream
4.14-release-acked patch to xen-tools for a compiler warning in kdd.
Signed-off-by: Christopher Clark <christopher.w.clark@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch')
-rw-r--r-- | recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch b/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch deleted file mode 100644 index d913be20..00000000 --- a/recipes-extended/xen/files/xen-tools-pygrub-change-tabs-into-spaces.patch +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | From b9e1368af14ded6aee3bdf64e8329628b16291ff Mon Sep 17 00:00:00 2001 | ||
2 | From: Wei Liu <wei.liu2@citrix.com> | ||
3 | Date: Mon, 11 Mar 2019 12:55:29 +0000 | ||
4 | Subject: [PATCH] pygrub: change tabs into spaces | ||
5 | |||
6 | Not sure why Python 2 never complained, but Python 3 does. | ||
7 | |||
8 | Change tabs to spaces. | ||
9 | |||
10 | Signed-off-by: Wei Liu <wei.liu2@citrix.com> | ||
11 | Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> | ||
12 | --- | ||
13 | tools/pygrub/src/pygrub | 4 ++-- | ||
14 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
15 | |||
16 | diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub | ||
17 | index 52a8965ad9..1189b1ca48 100755 | ||
18 | --- a/tools/pygrub/src/pygrub | ||
19 | +++ b/tools/pygrub/src/pygrub | ||
20 | @@ -858,7 +858,7 @@ if __name__ == "__main__": | ||
21 | output_directory = a | ||
22 | |||
23 | if debug: | ||
24 | - logging.basicConfig(level=logging.DEBUG) | ||
25 | + logging.basicConfig(level=logging.DEBUG) | ||
26 | |||
27 | |||
28 | try: | ||
29 | @@ -917,7 +917,7 @@ if __name__ == "__main__": | ||
30 | # IOErrors raised by fsimage.open | ||
31 | # RuntimeErrors raised by run_grub if no menu.lst present | ||
32 | if debug: | ||
33 | - traceback.print_exc() | ||
34 | + traceback.print_exc() | ||
35 | fs = None | ||
36 | continue | ||
37 | |||
38 | -- | ||
39 | 2.17.1 | ||
40 | |||