From 8fac45ee6eefb88c2e829d011c2528d9e0cf7d5c Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Fri, 21 Aug 2009 17:11:40 +0100 Subject: pygrub: Fix elilo handling after password patch. Signed-off-by: Michal Novotny --- tools/pygrub/src/GrubConf.py | 2 +- tools/pygrub/src/LiloConf.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tools/pygrub/src') diff --git a/tools/pygrub/src/GrubConf.py b/tools/pygrub/src/GrubConf.py index 55da6f6055..7d7652f945 100644 --- a/tools/pygrub/src/GrubConf.py +++ b/tools/pygrub/src/GrubConf.py @@ -219,7 +219,7 @@ class GrubConfigFile(object): try: getattr(self, self.commands['password']) return True - except KeyError, e: + except: return False def checkPassword(self, password): diff --git a/tools/pygrub/src/LiloConf.py b/tools/pygrub/src/LiloConf.py index 9d69a9446b..8f029571cf 100644 --- a/tools/pygrub/src/LiloConf.py +++ b/tools/pygrub/src/LiloConf.py @@ -138,6 +138,12 @@ class LiloConfigFile(object): if len(img) > 0: self.add_image(LiloImage(img, path)) + def hasPassword(self): + return False + + def hasPasswordAccess(self): + return True + def add_image(self, image): self.images.append(image) -- cgit v1.2.3