[PATCH] pygrub: correct typo in --args assignment

[PATCH] pygrub: correct typo in --args assignment

[Olaf Hering]

# HG changeset patch
# User Olaf Hering <olaf@aepfle.de>
# Date 1349716567 -7200
# Node ID de76ea76418f19248fd3e5541344a51c38c716ae
# Parent  c9f621893a05e3e447ba6770f8ae912721712569
pygrub: correct typo in --args assignment

If pygrub was called with --args="some thing", then this string should
be append to the kernel command line.  But the last changeset
25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'.

Rename the local variable which holds the string from the domain config
file to avoid further confusion.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

diff -r c9f621893a05 -r de76ea76418f tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -585,7 +585,7 @@ def get_entry_idx(cf, entry):
 
     return None
 
-def run_grub(file, entry, fs, arg):
+def run_grub(file, entry, fs, cfg_args):
     global g
     global sel
 
@@ -622,8 +622,8 @@ def run_grub(file, entry, fs, arg):
         grubcfg["ramdisk"] = img.initrd[1]
     if img.args:
         grubcfg["args"] += img.args
-    if arg:
-        grubcfg["args"] += " " + args
+    if cfg_args:
+        grubcfg["args"] += " " + cfg_args
 
     return grubcfg

Re: [PATCH] pygrub: correct typo in --args assignment

[Ian Campbell]

On Mon, 2012-10-08 at 18:17 +0100, Olaf Hering wrote:
> # HG changeset patch
> # User Olaf Hering <olaf@aepfle.de>
> # Date 1349716567 -7200
> # Node ID de76ea76418f19248fd3e5541344a51c38c716ae
> # Parent  c9f621893a05e3e447ba6770f8ae912721712569
> pygrub: correct typo in --args assignment
> 
> If pygrub was called with --args="some thing", then this string should
> be append to the kernel command line.  But the last changeset
> 25941:795c493fe561 contained a typo, it assigns 'args' instead of 'arg'.
> 
> Rename the local variable which holds the string from the domain config
> file to avoid further confusion.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>

Acked and committed, thanks.