projects
/
sitarba.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updating sample shbackup.conf
[sitarba.git]
/
shbackup
diff --git
a/shbackup
b/shbackup
index c74cd2b5fa8f66e8d8936f93974dca14f00d26f0..a13b96559f636573489ee479fc297a24f2f25481 100755
(executable)
--- a/
shbackup
+++ b/
shbackup
@@
-241,7
+241,7
@@
class Config:
if not e.mode in Modes:
raise Config.ReadError("Invalid mode '{0}'.".format(e.mode))
if not e.mode in Modes:
raise Config.ReadError("Invalid mode '{0}'.".format(e.mode))
- elif opt=="time
delta
":
+ elif opt=="time
span
":
if name in Epoch.units:
raise Config.ReadError("The time delta of a standard epoch " + \
"is not supposed to be redefined. ")
if name in Epoch.units:
raise Config.ReadError("The time delta of a standard epoch " + \
"is not supposed to be redefined. ")
@@
-251,7
+251,7
@@
class Config:
e.unit = unit
e.mult = mult
except ValueError as e:
e.unit = unit
e.mult = mult
except ValueError as e:
- raise Config.ReadError("Invalid time
delta
'{0}': {1}".format(td, str(e)))
+ raise Config.ReadError("Invalid time
span
'{0}': {1}".format(td, str(e)))
elif opt.startswith("exclude"):
e.excludes += [config.get(sec, opt)]
elif opt.startswith("exclude"):
e.excludes += [config.get(sec, opt)]
@@
-439,7
+439,8
@@
class BackupManager:
if rett != 0:
for l in errmsg.decode().split("\n"):
logfile.error(l)
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):
def backup(self, epoch=None, mode=None):