Merge branch 'master' into docs

3 files changed, 34 insertions, 2 deletions

diff --git a/src/lib/Server/Admin/Backup.py b/src/lib/Server/Admin/Backup.py
new file mode 100644
index 000000000..27a7fd8c8
--- /dev/null
+++ b/src/lib/Server/Admin/Backup.py
@@ -0,0 +1,32 @@
+import os
+import sys
+import time
+import tarfile
+import Bcfg2.Server.Admin
+import Bcfg2.Options
+
+class Backup(Bcfg2.Server.Admin.MetadataCore):
+    __shorthelp__ = "Make a backup of the Bcfg2 repository."
+    __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin backup")
+                                    #"\n\nbcfg2-admin backup restore")
+    __usage__ = ("bcfg2-admin backup")
+
+    def __init__(self, configfile):
+        Bcfg2.Server.Admin.MetadataCore.__init__(self, configfile,
+                                                 self.__usage__)
+
+    def __call__(self, args):
+        Bcfg2.Server.Admin.MetadataCore.__call__(self, args)
+        # Get Bcfg2 repo directory
+        opts = {'repo': Bcfg2.Options.SERVER_REPOSITORY}
+        setup = Bcfg2.Options.OptionParser(opts)
+        setup.parse(sys.argv[1:])
+        self.datastore = setup['repo']
+        timestamp = time.strftime('%Y%m%d%H%M%S')
+        format = 'gz'
+        mode = 'w:' + format
+        filename = timestamp + '.tar' + '.' + format
+        out = tarfile.open(self.datastore + '/' + filename, mode=mode)
+        out.add(self.datastore, os.path.basename(self.datastore))
+        out.close()
+        print "Archive %s was stored under %s" % (filename, self.datastore)
diff --git a/src/lib/Server/Admin/__init__.py b/src/lib/Server/Admin/__init__.py
index 3a088b2fb..bb5c41895 100644
--- a/src/lib/Server/Admin/__init__.py
+++ b/src/lib/Server/Admin/__init__.py
@@ -2,7 +2,7 @@ __revision__ = '$Revision$'
 
 __all__ = ['Mode', 'Client', 'Compare', 'Init', 'Minestruct', 'Perf',
            'Pull', 'Query', 'Reports', 'Snapshots', 'Tidy', 'Viz', 
-           'Xcmd', 'Group']
+           'Xcmd', 'Group', 'Backup']
 
 import ConfigParser
 import logging
diff --git a/src/sbin/bcfg2-info b/src/sbin/bcfg2-info
index 497c39174..f379a51bb 100755
--- a/src/sbin/bcfg2-info
+++ b/src/sbin/bcfg2-info
@@ -238,7 +238,7 @@ class infoCore(cmd.Cmd, Bcfg2.Server.Core.Core):
                 return
 
             # handle <Path type='file'> entries
-            for configfile in [cfile for cfile in client_config.findall(".//Path[@type = 'file']")]:
+            for configfile in [cfile for cfile in client_config.xpath(".//Path[@type = 'file']")]:
                 try:
                     write_config_file(odir, configfile)
                 except FileNotBuilt, ex: