x
/
giftwrap
Code Issues Proposed changes

Revert package building in tempdirs 

I clearly wasnt thinking when I implemented building packages in
tempdirs. The problem is that virtualenvs are not (really) relocatable,
so building in a tempdir is realy a no-go. Now ensure that packages are
being built in their destination paths.
This commit is contained in:
Craig Tracey 2014-12-13 12:05:03 -05:00
parent 5bf3865c09
commit e0e8de0514
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
giftwrap/builders/package_builder.py
View File

@ -22,7 +22,7 @@ import tempfile
from giftwrap.gerrit import GerritReview
from giftwrap.openstack_git_repo import OpenstackGitRepo
from giftwrap.package import Package
from giftwrap.util import execute, relative_pathify
from giftwrap.util import execute
LOG = logging.getLogger(__name__)
@ -55,16 +55,23 @@ class PackageBuilder(Builder):
self._tempdir = tempfile.mkdtemp(prefix='giftwrap')
src_path = os.path.join(self._tempdir, 'src')
build_path = os.path.join(self._tempdir, 'build')
os.makedirs(build_path)
LOG.debug("Temporary working directory: %s", self._tempdir)
for project in spec.projects:
LOG.info("Beginning to build '%s'", project.name)
install_path = os.path.join(build_path,
relative_pathify(project.install_path))
install_path = project.install_path
LOG.debug("Installing '%s' to '%s'", project.name, install_path)
# if anything is in our way, see if we can get rid of it
if os.path.exists(install_path):
if spec.settings.force_overwrite:
LOG.info("force_overwrite is set, so removing "
"existing path '%s'" % install_path)
shutil.rmtree(install_path)
else:
raise Exception("Install path '%s' already exists" %
install_path)
os.makedirs(install_path)
# clone the project's source to a temporary directory
@ -99,9 +106,8 @@ class PackageBuilder(Builder):
execute("%s install pbr" % venv_pip_path)
# now build the package
pkg = Package(project.package_name, project.version, build_path,
relative_pathify(project.install_path),
spec.settings.output_dir,
pkg = Package(project.package_name, project.version,
install_path, spec.settings.output_dir,
spec.settings.force_overwrite,
project.system_dependencies)
pkg.build()

9
giftwrap/package.py
View File

@ -28,11 +28,10 @@ SUPPORTED_DISTROS = {
class Package(object):
def __init__(self, name, version, build_path, install_path, output_dir,
def __init__(self, name, version, install_path, output_dir,
overwrite=False, dependencies=None):
self.name = name
self.version = version
self.build_path = build_path
self.install_path = install_path
self.output_dir = output_dir
self.overwrite = overwrite
@ -57,6 +56,6 @@ class Package(object):
os.makedirs(self.output_dir)
# not wrapping in a try block - handled by caller
execute("fpm %s -s dir -t %s -n %s -v %s -C %s %s %s" % (overwrite,
target, self.name, self.version, self.build_path, deps,
self.install_path), self.output_dir)
execute("fpm %s -s dir -t %s -n %s -v %s %s %s" % (overwrite,
target, self.name, self.version, deps, self.install_path),
self.output_dir)