From: Mikael Frykholm <mikael@backup.codemill.se>
Date: Mon, 23 May 2016 17:49:07 +0000 (+0200)
Subject: Merge branch 'master' of https://github.com/mikaelfrykholm/butterbackup
X-Git-Url: https://git.frykholm.com/butterbackup.git/commitdiff_plain/017bc0906a5afadb5ff897995f15919c5278d92e?hp=a0ce12658f7ddb271ec62fd151d7b68396885703

Merge branch 'master' of https://github.com/mikaelfrykholm/butterbackup
---

diff --git a/butterbackup.py b/butterbackup.py
index a1086b9..2682227 100755
--- a/butterbackup.py
+++ b/butterbackup.py
@@ -73,16 +73,22 @@ class BackupRunner():
             print("No config found", self.config_dir)
             sys-exit(-1)
 
-    def run(self):
-        self.hosts = os.listdir(self.config_dir)
+    def run(self, hostlist=None):
+        self.hosts = hostlist or os.listdir(self.config_dir)
 
         for host in self.hosts:
             if host == 'default.cfg':
                 continue
             try:
+                configfile = os.path.join(self.config_dir, host)
+
+                if not os.path.exists(configfile):
+                    # Trigger logging in the except clause
+                    raise BaseException()
+
                 config = configparser.ConfigParser(strict=False)
                 config.read_file(open(os.path.join(self.config_dir, 'default.cfg'),'r'))
-                config.read(os.path.join(self.config_dir, host))
+                config.read(configfile)
             except BaseException as ex:
                 print("Config error for %s. Skipping host."%host)
                 continue
@@ -95,5 +101,9 @@ if __name__ == "__main__":
         print("You need to be root. Otherwise all permissions will be lost.")
         sys.exit(-1)
     br = BackupRunner("/etc/butterbackup")
-    br.run()
+
+    hostlist = sys.argv[1:]
+    br.run(hostlist=hostlist)
+
     sys.exit(0)
+