X-Git-Url: https://git.sthu.org/?p=sitarba.git;a=blobdiff_plain;f=shbackup;h=a13b96559f636573489ee479fc297a24f2f25481;hp=f8f8c26f324fe5cb4d830d553a086e8f0668f141;hb=9a7eb042b4588ada18de0b56fd48d91eaa49f84e;hpb=52109733736bd4bc080330f10f33c47cf7a81c4d

diff --git a/shbackup b/shbackup
index f8f8c26..a13b965 100755
--- a/shbackup
+++ b/shbackup
@@ -172,7 +172,7 @@ class Config:
 
     def __init__(self):
         self.backupdir = None
-        self.format = self.formats[0]
+        self.format = self.formats[1]
         self.tarbin = "/bin/tar"
         self.excludes = []
         self.sets = []
@@ -241,7 +241,7 @@ class Config:
                 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. ")
@@ -251,7 +251,7 @@ class Config:
                     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)]
@@ -439,7 +439,8 @@ class BackupManager:
         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):