Sane rsync returncodes

[butterbackup.git] / butterbackup.py

diff --git a/butterbackup.py b/butterbackup.py
index 7c80e8b344467f61e1a9738508ec09f020a311c0..a1086b993c0db1a4df80fb23d2e8f3449ce8f99f 100755 (executable)
--- a/butterbackup.py
+++ b/butterbackup.py
@@ -19,8 +19,8 @@ class Host():
 
     def backup(self):
         if not os.path.exists(self.host_dir):
-            print("New host",host,".")
-            os.makedir(self.host_dir)
+            print("New host",self.name,".")
+            os.makedirs(self.host_dir)
         if not os.path.exists(self.subvol_dir):
             try:
                 check_call(shlex.split("btrfs subvol create %s"% self.subvol_dir))
@@ -34,8 +34,10 @@ class Host():
             print(command + excludes + " root@%s:/ "%(self.name) + self.subvol_dir)
             check_call(shlex.split(command + excludes + " root@%s:/ "%(self.name) + self.subvol_dir))
         except CalledProcessError as ex:
-            if ex.returncode not in (12, 30):
-                print("Rsync did not transfer anything from %s, skipping snapshot."%self.name)
+            if ex.returncode in (24,):
+                pass
+            else:
+                print("Rsync error from %s, skipping snapshot. Rsync exit value=%s"%(self.name, ex.returncode))
                 return()
         todays_date = datetime.datetime.now().date().strftime("%F")
         if os.path.exists(os.path.join(self.host_dir, todays_date)):
@@ -53,7 +55,9 @@ class Host():
         if self.keep == -1:
             print("No keep specified for %s, keeping all"%self.name)
             return
-
+        if not os.path.exists(self.host_dir):
+            print("New host, no pruning needed")
+            return
         snaps = sorted([snap for snap in os.listdir(self.host_dir) if not snap == "latest" ], reverse=True)
         while len(snaps) > self.keep:
             snap = snaps.pop()
@@ -63,9 +67,8 @@ class Host():
                 pass    
 
 class BackupRunner():
-    def __init__(self, config_dir, dest_dir):
+    def __init__(self, config_dir):
         self.config_dir = config_dir
-        self.dest_dir = dest_dir
         if not os.path.exists(self.config_dir):
             print("No config found", self.config_dir)
             sys-exit(-1)
@@ -91,6 +94,6 @@ if __name__ == "__main__":
     if os.geteuid() != 0:
         print("You need to be root. Otherwise all permissions will be lost.")
         sys.exit(-1)
-    br = BackupRunner("/etc/butterbackup", "/mnt/data2")
+    br = BackupRunner("/etc/butterbackup")
     br.run()
     sys.exit(0)