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

Signed-off-by: Michal Novotny <minovotn@redhat.com>

Index: xen-3.4.1-testing/tools/pygrub/src/GrubConf.py
===================================================================
--- xen-3.4.1-testing.orig/tools/pygrub/src/GrubConf.py
+++ xen-3.4.1-testing/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):
Index: xen-3.4.1-testing/tools/pygrub/src/LiloConf.py
===================================================================
--- xen-3.4.1-testing.orig/tools/pygrub/src/LiloConf.py
+++ xen-3.4.1-testing/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)