Merge branch 'master' of github.com:davidhalter/depl

AUTHORS.txt

@@ -6,5 +6,6 @@ David Halter (@davidhalter) <davidhalter88@gmail.com>
 Code Contributors
 =================
 
-
 Note: (@user) means a github user name.
+
+Danilo Bargen (@dbrgn) <github@dbrgn.ch>

depl/__init__.py

@@ -30,10 +30,10 @@ def main():
     try:
         c = config.Config(args['--config'], args['<host>'], args['--pool'])
     except IOError:
-        sys.stderr.write("Couldn't find config file.")
+        sys.stderr.write("Couldn't find depl config file ({0}).\n".format(args['--config']))
         sys.exit(1)
     except config.ValidationError as e:
-        sys.stderr.write("Config file is invalid: " + e.message)
+        sys.stderr.write("Config file is invalid: {0}\n".format(e.message))
         sys.exit(2)
 
     for pool in c.pools:

depl/deploy/__init__.py

@@ -26,8 +26,8 @@ def install_packages():
         with hide('stdout'):
             # Need a new line after sources.list, which sometimes doesn't end
             # with one, easiest option: awk.
-            apt_txt = run('awk \'FNR==1{print ""}1\' '
-                          '/etc/apt/sources.list /etc/apt/sources.list.d/*')
+            apt_txt = run('find /etc/apt/sources.list{,.d} -type f '
+                          '-exec awk \'FNR==1{print ""}1\' {} \;')
 
         force_update = False
         for package in packages: