summaryrefslogtreecommitdiffstats
path: root/src/lib/Server
diff options
context:
space:
mode:
authorFabian Affolter <fabian@bernewireless.net>2010-12-05 21:50:18 +0100
committerFabian Affolter <fabian@bernewireless.net>2010-12-05 21:50:18 +0100
commit94e4f622b4dee6b33983a17313c0ef5a71c93f2e (patch)
tree10a396ab807183c1a924f5ce6bf49c5a5009753b /src/lib/Server
parentc9eec98340168b1e9e3f4877b15b681855ee696b (diff)
downloadbcfg2-94e4f622b4dee6b33983a17313c0ef5a71c93f2e.tar.gz
bcfg2-94e4f622b4dee6b33983a17313c0ef5a71c93f2e.tar.bz2
bcfg2-94e4f622b4dee6b33983a17313c0ef5a71c93f2e.zip
Backup part reworked
Diffstat (limited to 'src/lib/Server')
-rw-r--r--src/lib/Server/Admin/Backup.py38
1 files changed, 11 insertions, 27 deletions
diff --git a/src/lib/Server/Admin/Backup.py b/src/lib/Server/Admin/Backup.py
index f150b9cf0..27a7fd8c8 100644
--- a/src/lib/Server/Admin/Backup.py
+++ b/src/lib/Server/Admin/Backup.py
@@ -1,4 +1,3 @@
-import glob
import os
import sys
import time
@@ -8,9 +7,9 @@ import Bcfg2.Options
class Backup(Bcfg2.Server.Admin.MetadataCore):
__shorthelp__ = "Make a backup of the Bcfg2 repository."
- __longhelp__ = (__shorthelp__ + "\n\nbcfg2-admin backup start"
- "\n\nbcfg2-admin backup restore")
- __usage__ = ("bcfg2-admin backup [start|restore]")
+ __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,
@@ -23,26 +22,11 @@ class Backup(Bcfg2.Server.Admin.MetadataCore):
setup = Bcfg2.Options.OptionParser(opts)
setup.parse(sys.argv[1:])
self.datastore = setup['repo']
-
- if len(args) == 0:
- self.errExit("No argument specified.\n"
- "Please see bcfg2-admin backup help for usage.")
- if args[0] == 'start':
- 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)
- content = os.listdir(self.datastore)
- for item in content:
- out.add(item)
- out.close()
- print "Archive %s was stored.\nLocation: %s" % (filename, self.datastore)
-
- elif args[0] == 'restore':
- print 'Not implemented yet'
-
- else:
- print "No command specified"
- raise SystemExit(1)
-
+ 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)