From ada90ce49fb54ed7cd6ab569bb486c9c17ddad8c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Tue, 15 Sep 2009 09:21:34 +0100 Subject: pygrub: Correct pygrub return value This is the patch to correct pygrub return value for checkPassword() function. It didn't return False at the end of the function. It returned None so it was working fine and it's most likely just a cosmetic issue. Also, the missing () were added to checkPassword() function when calling hasPassword and the unnecessary comment was removed. Signed-off-by: Michal Novotny --- tools/pygrub/src/GrubConf.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools/pygrub/src/GrubConf.py') diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 4aac8c189b..cfd75dbc48 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -220,10 +220,9 @@ class GrubConfigFile(object): def checkPassword(self, password): # Always allow if no password defined in grub.conf - if not self.hasPassword: + if not self.hasPassword(): return True - # If we're here, we're having 'password' attribute set pwd = getattr(self, 'password').split() # We check whether password is in MD5 hash for comparison @@ -240,6 +239,8 @@ class GrubConfigFile(object): if pwd[0] == password: return True + return False + def set(self, line): (com, arg) = grub_exact_split(line, 2) if self.commands.has_key(com): -- cgit v1.2.3