Commit 6b18ffec authored by Yingjie Xu's avatar Yingjie Xu

Upload SR even it is not a new installation.

parent 3067845c
...@@ -82,10 +82,8 @@ class Software(object): ...@@ -82,10 +82,8 @@ class Software(object):
tarname = self.software_url_hash tarname = self.software_url_hash
cache_dir = tempfile.mkdtemp() cache_dir = tempfile.mkdtemp()
tarpath = os.path.join(cache_dir, tarname) tarpath = os.path.join(cache_dir, tarname)
if os.path.exists(self.software_path): if (not os.path.exists(self.software_path)) \
self._install_from_buildout() and download_network_cached(
else:
if download_network_cached(
self.download_binary_cache_url, self.download_binary_cache_url,
self.download_binary_dir_url, self.download_binary_dir_url,
self.url, self.software_root, self.url, self.software_root,
...@@ -97,7 +95,7 @@ class Software(object): ...@@ -97,7 +95,7 @@ class Software(object):
tar.extractall(path=self.software_root) tar.extractall(path=self.software_root)
finally: finally:
tar.close() tar.close()
else: else:
self._install_from_buildout() self._install_from_buildout()
tar = tarfile.open(tarpath, "w:gz") tar = tarfile.open(tarpath, "w:gz")
try: try:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment