Merge branch 'km/test-fix' into 'master'

Fix default make tarball behaviour and test

See merge request CodethinkLabs/lorry/lorry!29

1 files changed, 4 insertions, 3 deletions

diff --git a/lorry b/lorry
index 2a55969..3e7135e 100755
--- a/lorry
+++ b/lorry
@@ -223,8 +223,8 @@ class Lorry(cliapp.Application):
                              'first will only tar if there is not already '
                              'a tarball in TARBALLS (default: first)')
         self.settings.string(['tarball-dest'],
-                             'put created tarballs in TARBALLS',
-                             metavar='TARBALLS')
+                             'put created tarballs in DIR',
+                             metavar='DIR', default='git-tars')
         self.settings.boolean(['keep-multiple-backups'],
                               'keep multiple (time-stamped) backups (disabled by default)',
                               default=False)
@@ -249,7 +249,8 @@ class Lorry(cliapp.Application):
             self.settings[setting_name] = full_path
 
         ensure_path_exists('working-area')
-        ensure_path_exists('tarball-dest')
+        if self.settings['tarball'] != 'never':
+            ensure_path_exists('tarball-dest')
 
         urllib.request.install_opener(
             urllib.request.build_opener(SimpleFTPHandler))