[Xen-changelog] [xen staging] tools/pygrub: Failing to set value to 0 in Grub2ConfigFile

[patchbot@xxxxxxx]

commit e5368348d33be8cc476433489e362834a47e4dcf
Author:     Michael Young <m.a.young@xxxxxxxxxxxx>
AuthorDate: Tue Aug 13 21:15:02 2019 +0100
Commit:     Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
CommitDate: Wed Aug 14 12:15:17 2019 +0100

    tools/pygrub: Failing to set value to 0 in Grub2ConfigFile
    
    In Grub2ConfigFile the code to handle ${saved_entry} and ${next_entry}
    sets arg = "0" but this now does nothing following c/s d1b93ea2615bd
    "tools/pygrub: Make pygrub understand default entry in string format"
    which replaced arg.strip() with arg_strip in the following line.  This
    patch restores the previous behaviour.
    
    Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
    Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
 tools/pygrub/src/GrubConf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py
index 594139bac7..73f1bbed2f 100644
--- a/tools/pygrub/src/GrubConf.py
+++ b/tools/pygrub/src/GrubConf.py
@@ -440,7 +440,7 @@ class Grub2ConfigFile(_GrubConfigFile):
                     arg_strip = arg.strip()
                     if arg_strip == "${saved_entry}" or arg_strip == 
"${next_entry}":
                         logging.warning("grub2's saved_entry/next_entry not 
supported")
-                        arg = "0"
+                        arg_strip = "0"
                     setattr(self, self.commands[com], arg_strip)
                 else:
                     logging.info("Ignored directive %s" %(com,))
--
generated by git-patchbot for /home/xen/git/xen.git#staging

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog