diff options
| author | Fabian Affolter <fabian@bernewireless.net> | 2010-12-05 21:50:18 +0100 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2010-12-07 20:22:17 -0600 |
| commit | 8f96008ca5d3a567bed009dd0401007aa6cb9223 (patch) | |
| tree | 1c56f2f57e2aa40e2200c8817bb54e66ab0f217d /src | |
| parent | 1d8a9780d38b095ac2e67e3aeb5e436c756b719a (diff) | |
| download | bcfg2-8f96008ca5d3a567bed009dd0401007aa6cb9223.tar.gz bcfg2-8f96008ca5d3a567bed009dd0401007aa6cb9223.tar.bz2 bcfg2-8f96008ca5d3a567bed009dd0401007aa6cb9223.zip | |
Backup part reworked
(cherry picked from commit 94e4f622b4dee6b33983a17313c0ef5a71c93f2e)
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Admin/Backup.py | 38 |
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) |