Merge branch 'benbrown/kbas-silence' into 'master'

kbas: fixup and silence tar/touch output

See merge request baserock/ybd!391

1 files changed, 9 insertions, 4 deletions

diff --git a/kbas/__main__.py b/kbas/__main__.py
index 383a00a..23d251c 100755
--- a/kbas/__main__.py
+++ b/kbas/__main__.py
@@ -93,7 +93,9 @@ class KeyedBinaryArtifactServer(object):
     @bottle.get('/get/<cache_id>')
     def get_artifact(cache_id):
         f = os.path.join(cache_id, cache_id)
-        call(['touch', f])
+        with open(os.devnull, 'w') as fnull:
+            call(['touch', os.path.join(app.config['artifact-dir'], f)],
+                 stdout=fnull, stderr=fnull)
         app.config['downloads'] += 1
         return static_file(f, root=app.config['artifact-dir'], download=True,
                            mimetype='application/x-tar')
@@ -190,9 +192,12 @@ class KeyedBinaryArtifactServer(object):
                 if ftype != "application/x-rpm":
                     app.log('UPLOAD', 'ERROR: not a valid rpm:', artifact)
                     raise TypeError("Not a valid rpm")
-            elif call(['tar', 'tf', artifact]):
-                app.log('UPLOAD', 'ERROR: not a valid tarfile:', artifact)
-                raise
+            else:
+                with open(os.devnull, 'w') as fnull:
+                    if call(['tar', 'tf', artifact], stdout=fnull):
+                        app.log('UPLOAD', 'ERROR: not a valid tarfile:',
+                                artifact)
+                        raise TypeError('Not a valid tarfile')
             checksum = cache.md5(artifact)
             with open(artifact + '.md5', "a") as f:
                 f.write(checksum)