Do nothing if binary cache if not well configured.

567453a0 · Yingjie Xu · Cédric de Saint Martin · ed6eca0e · 567453a0
Commit 567453a0 authored Feb 29, 2012 by Yingjie Xu Committed by Cédric de Saint Martin Feb 29, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 19 additions and 16 deletions

slapos/grid/SlapObject.py slapos/grid/SlapObject.py +19 -16

No files found.
--- a/slapos/grid/SlapObject.py
+++ b/slapos/grid/SlapObject.py
@@ -97,22 +97,25 @@ class Software(object):
          tar.close()
    else:
        self._install_from_buildout()
-        tar = tarfile.open(tarpath, "w:gz")
+        if (self.software_root and self.url and self.software_url_hash \
-        try:
+                               and self.upload_binary_cache_url \
-          tar.add(self.software_path, arcname=self.software_url_hash)
+                               and self.upload_binary_dir_url):
-        finally:
+          tar = tarfile.open(tarpath, "w:gz")
-          tar.close()
+          try:
-        upload_network_cached(
+            tar.add(self.software_path, arcname=self.software_url_hash)
-          self.software_root,
+          finally:
-          self.url, self.software_url_hash,
+            tar.close()
-          self.upload_binary_cache_url,
+          upload_network_cached(
-          self.upload_binary_dir_url,
+            self.software_root,
-          tarpath, self.logger,
+            self.url, self.software_url_hash,
-          self.signature_private_key_file,
+            self.upload_binary_cache_url,
-          self.shacache_cert_file,
+            self.upload_binary_dir_url,
-          self.shacache_key_file,
+            tarpath, self.logger,
-          self.shadir_cert_file,
+            self.signature_private_key_file,
-          self.shadir_key_file)
+            self.shacache_cert_file,
+            self.shacache_key_file,
+            self.shadir_cert_file,
+            self.shadir_key_file)
    shutil.rmtree(cache_dir)
  def _install_from_buildout(self):