EncapPackages: Runit now installs/removes/installs/removes cleanly.

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

1 files changed, 1 insertions, 39 deletions

diff --git a/encap/src/encap-profiles/bcfg2-0.9.2.ep b/encap/src/encap-profiles/bcfg2-0.9.2.ep
index b32a799a2..6ac3b92df 100644
--- a/encap/src/encap-profiles/bcfg2-0.9.2.ep
+++ b/encap/src/encap-profiles/bcfg2-0.9.2.ep
@@ -70,44 +70,6 @@ url="http://encapsrcdist/mirror/bcfg/bcfg2-0.9.2.tar.gz
      ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-0.9.2.tar.gz"
 >
 
-<patch options="-p1"><![CDATA[
---- bcfg2-0.9.2/src/lib/Client/XML.py.orig	2006-10-09 23:56:01.000000000 -0400
-+++ bcfg2-0.9.2/src/lib/Client/XML.py	2006-10-10 00:02:42.000000000 -0400
-@@ -1,24 +1,13 @@
- '''XML lib compatibility layer for the Bcfg2 client'''
- __revision__ = '$Revision: 2064 $'
- 
--# library will use lxml, then builtin xml.etree, then ElementTree
-+# Changed for EncapPackages - always use ElementTree, or raise an exception
- 
- try:
--    from lxml.etree import Element, SubElement, XML, tostring
--    from lxml.etree import XMLSyntaxError as ParseError
--    driver = 'lxml'
-+    from elementtree.ElementTree import Element, SubElement, XML, tostring
-+    from xml.parsers.expat import ExpatError as ParseError
-+    driver = 'etree'
- except ImportError:
--    # lxml not available 
--    try:
--        from xml.etree.ElementTree import Element, SubElement, XML, tostring
--        from xml.parsers.expat import ExpatError as ParseError
--        driver = 'etree-py'
--    except ImportError:
--        try:
--            from elementtree.ElementTree import Element, SubElement, XML, tostring
--            from xml.parsers.expat import ExpatError as ParseError
--            driver = 'etree'
--        except ImportError:
--            print "Failed to load lxml, xml.etree and elementtree.ElementTree"
--            print "Cannot continue"
--            raise SystemExit, 1
-+    print "Failed to load elementtree.ElementTree"
-+    print "Cannot continue"
-+    raise SystemExit, 1
-
-]]></patch>
-
 <configure type="unset" />
 
 <build>
@@ -172,7 +134,7 @@ test -d etc/sv || mkdir etc/sv
 test -d etc/sv/bcfg2-client || mkdir etc/sv/bcfg2-client
 test -d etc/sv/bcfg2-client/log || mkdir etc/sv/bcfg2-client/log
 test -d etc/sv/bcfg2-server || mkdir etc/sv/bcfg2-server
-test -d etc/sv/bcfg2-server/log  || mkdir etc/sv/bcfg2-server/log
+test -d etc/sv/bcfg2-server/log || mkdir etc/sv/bcfg2-server/log
 # Make "this encap is installed" sentinal file available in /usr/local/var/encap
 test -d  var/encap || mkdir var/encap
 touch var/encap/${ENCAP_PKGNAME}