From 65ca13feeef2f5257135f884ae1433fdbb2220ee Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Tue, 11 Sep 2012 10:37:48 -0400
Subject: bcfg2-crypt: handle bogus xpath expression gracefully

---
 src/sbin/bcfg2-crypt | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/sbin/bcfg2-crypt b/src/sbin/bcfg2-crypt
index a26bf61c8..a40bab994 100755
--- a/src/sbin/bcfg2-crypt
+++ b/src/sbin/bcfg2-crypt
@@ -270,6 +270,9 @@ class PropertiesEncryptor(Encryptor):
         xdata = lxml.etree.XML(data)
         if self.setup['xpath']:
             elements = xdata.xpath(self.setup['xpath'])
+            if not elements:
+                raise EncryptionChunkingError("XPath expression %s matched no "
+                                              "elements" % self.setup['xpath'])
         else:
             elements = xdata.xpath('//*[@encrypted]')
             if not elements:
-- 
cgit v1.2.3-1-g7c22