Merge branch 'benbrown/rpm-deployment' into 'master'

Fix rpm deployment

See merge request !361

1 files changed, 5 insertions, 1 deletions

diff --git a/ybd/rpm.py b/ybd/rpm.py
index f28029a..3ed4e64 100644
--- a/ybd/rpm.py
+++ b/ybd/rpm.py
@@ -1,4 +1,5 @@
 import os
+import re
 import sys
 from collections import Mapping
 from cache import cache_key, get_cache, md5
@@ -274,6 +275,9 @@ def get_remote_rpm(dn, pkgfilename):
                 f.write(response.content)
             cache_dst = os.path.join(app.config['artifacts'], pkgfilename)
             os.rename(cachefile, cache_dst)
+            size = os.path.getsize(cache_dst)
+            size = re.sub("(\d)(?=(\d{3})+(?!\d))", r"\1,", "%d" % size)
+            app.log(dn, 'Cached %s bytes as' % size, pkgfilename)
             return True
         except Exception as e:
             app.log(dn, "WARNING: Failed to download {}: {}"
@@ -471,7 +475,7 @@ def deploy_rpm(dn, userdata):
         if not os.path.exists(dstdir):
             os.makedirs(dstdir)
         shutil.copyfile(cached_path, dstpath)
-        return True
+    return True
 
 
 def deploy_rpms(system, whitelist=None):