diff options
| author | Matthew Daley <mattjd@gmail.com> | 2012-11-12 17:03:21 +0000 |
|---|---|---|
| committer | Matthew Daley <mattjd@gmail.com> | 2012-11-12 17:03:21 +0000 |
| commit | 0c6601ee18c664a8702c142bd901ebc9539ac48d (patch) | |
| tree | 22e3b102c4cbd9cbb9a88a49db71fe296f6bb3a0 /tools/pygrub/src/LiloConf.py | |
| parent | c61788c33886f8708bf30337b5e460678037cae9 (diff) | |
| download | xen-0c6601ee18c664a8702c142bd901ebc9539ac48d.tar.gz xen-0c6601ee18c664a8702c142bd901ebc9539ac48d.tar.bz2 xen-0c6601ee18c664a8702c142bd901ebc9539ac48d.zip | |
pygrub: Fix command line argument error handling
pygrub's individual config file parsers do not correctly check the
amount of command line arguments given to them. In addition, the LILO
config parser would report an incorrect message.
Use len() to correctly check the amount of arguments, and fix the LILO
error message.
Signed-off-by: Matthew Daley <mattjd@gmail.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Campbell <ian.campbell@citrix.com>
Diffstat (limited to 'tools/pygrub/src/LiloConf.py')
| -rw-r--r-- | tools/pygrub/src/LiloConf.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py index 9858ae26f5..2cb649f115 100644 --- a/tools/pygrub/src/LiloConf.py +++ b/tools/pygrub/src/LiloConf.py @@ -169,8 +169,8 @@ class LiloConfigFile(object): } if __name__ == "__main__": - if sys.argv < 2: - raise RuntimeError, "Need a grub.conf to read" + if len(sys.argv) < 2: + raise RuntimeError, "Need a lilo.conf to read" g = LiloConfigFile(sys.argv[1]) for i in g.images: print i #, i.title, i.root, i.kernel, i.args, i.initrd |