Add error handling to bcfg2-admin compare (Resolves Ticket #409)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2976 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 12 insertions, 2 deletions

diff --git a/src/sbin/bcfg2-admin b/src/sbin/bcfg2-admin
index 2a570df56..52525e072 100755
--- a/src/sbin/bcfg2-admin
+++ b/src/sbin/bcfg2-admin
@@ -236,8 +236,18 @@ def do_compare(cargs):
         print "Usage: bcfg2-admin compare <old> <new>"
         raise SystemExit
 
-    new = lxml.etree.parse(new).getroot()
-    old = lxml.etree.parse(old).getroot()
+    try:
+        new = lxml.etree.parse(new).getroot()
+    except IOError:
+        print "Failed to read %s" % (new)
+        raise SystemExit, 1
+
+    try:
+        old = lxml.etree.parse(old).getroot()
+    except IOError:
+        print "Failed to read %s" % (old)
+        raise SystemExit, 1
+    
     for src in [new, old]:
         for bundle in src.findall('./Bundle'):
             if bundle.get('name')[-4:] == '.xml':