[Xen-changelog] [xen-unstable] pygrub: Fix elilo handling after password patch.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1250871100 -3600
# Node ID 168f0cfeded0ad64e03d821efe5dcbe2eb5806a3
# Parent  4207d83fc78ef63016a4163b09f30aa471e4bdb8
pygrub: Fix elilo handling after password patch.

Signed-off-by: Michal Novotny <minovotn@xxxxxxxxxx>
---
 tools/pygrub/src/GrubConf.py |    2 +-
 tools/pygrub/src/LiloConf.py |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff -r 4207d83fc78e -r 168f0cfeded0 tools/pygrub/src/GrubConf.py
--- a/tools/pygrub/src/GrubConf.py      Fri Aug 21 17:00:01 2009 +0100
+++ b/tools/pygrub/src/GrubConf.py      Fri Aug 21 17:11:40 2009 +0100
@@ -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 -r 4207d83fc78e -r 168f0cfeded0 tools/pygrub/src/LiloConf.py
--- a/tools/pygrub/src/LiloConf.py      Fri Aug 21 17:00:01 2009 +0100
+++ b/tools/pygrub/src/LiloConf.py      Fri Aug 21 17:11:40 2009 +0100
@@ -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)
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog