def __init__(self):
self.backupdir = None
- self.format = self.formats[0]
+ self.format = self.formats[1]
self.tarbin = "/bin/tar"
self.excludes = []
self.sets = []
if not e.mode in Modes:
raise Config.ReadError("Invalid mode '{0}'.".format(e.mode))
- elif opt=="timedelta":
+ elif opt=="timespan":
if name in Epoch.units:
raise Config.ReadError("The time delta of a standard epoch " + \
"is not supposed to be redefined. ")
e.unit = unit
e.mult = mult
except ValueError as e:
- raise Config.ReadError("Invalid timedelta '{0}': {1}".format(td, str(e)))
+ raise Config.ReadError("Invalid timespan '{0}': {1}".format(td, str(e)))
elif opt.startswith("exclude"):
e.excludes += [config.get(sec, opt)]
if rett != 0:
for l in errmsg.decode().split("\n"):
logfile.error(l)
- logfile.error(tarpath + " returned with exit status " + str(rett) + ".")
+ logfile.error(self.conf.tarbin + " returned with exit status " + \
+ str(rett) + ".")
def backup(self, epoch=None, mode=None):
print("")
print("Options:")
print(" -h, --help print this usage text")
- print(" -c, --conf <configfile> use given configuration file")
+ print(" -c, --conf FILE use given configuration file")
print(" default: /etc/shbackup.conf")
- print(" -e, --epoch <epoch> force to create backup for given epoch:")
- print(" year, month, week, day, hour, sporadic")
- print(" -m, --mode <mode> override mode: full, diff, or incr")
+ print(" -e, --epoch EPOCH force to create backup for given epoch, which")
+ print(" can be 'sporadic' or one of the configured epochs")
+ print(" -m, --mode MODE override mode: full, diff, or incr")
print(" -v, --verbose be more verbose and interact with user")
print(" --verbosity LEVEL set verbosity to LEVEL, which can be")
print(" error, warning, info, debug")