From bbbc83d568bda1becc2906495f2b68e0faeb1682 Mon Sep 17 00:00:00 2001 From: Kris Lindgren Date: Wed, 8 Jul 2015 22:46:45 -0600 Subject: [PATCH] Correctly handle missing relocatable path Change-Id: Ib9bb021558cafb9b9cfeb8189c2066ce1cc91239 --- anvil/packaging/venv.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/anvil/packaging/venv.py b/anvil/packaging/venv.py index c91f6ff6..526e73a7 100644 --- a/anvil/packaging/venv.py +++ b/anvil/packaging/venv.py @@ -125,6 +125,11 @@ class VenvDependencyHandler(base.DependencyHandler): continue venv_dir = sh.abspth(self._venv_directory_for(instance)) + release = str(instance.get_option("release", default_value=1)) + if release and not release.startswith('-'): + release = '-' + release + version_full = instance.egg_info['version'] + release + # Replace paths with virtualenv deployment directory. if self.opts.get('venv_deploy_dir'): deploy_dir = sh.joinpths(self.opts.get('venv_deploy_dir'), @@ -139,13 +144,12 @@ class VenvDependencyHandler(base.DependencyHandler): LOG.info("Adjusted %s deployment path(s) in %s files", adjustments, files_replaced) - release = str(instance.get_option("release", default_value=1)) - if release and not release.startswith('-'): - release = '-' + release - version_full = instance.egg_info['version'] + release + tar_path = sh.joinpths(self.opts.get('venv_deploy_dir'), '%s-%s-venv' % ( + instance.name, version_full)) + else: + tar_path = '%s-%s-venv' % (instance.name, version_full) # Create a tarball containing the virtualenv. - tar_path = sh.joinpths(self.opts.get('venv_deploy_dir'), '%s-%s-venv' % (instance.name, version_full)) tar_filename = sh.joinpths(venv_dir, '%s-%s-venv.tar.gz' % (instance.name, version_full)) LOG.info("Making tarball of %s built for %s with version %s at %s", venv_dir,