Commit f2940c5b authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

use slapos.recipe.build:downloadunpacked instead of hexagonit.recipe.download.

parent 98f1574c
......@@ -50,7 +50,7 @@ setup(
install_requires=[
'zc.buildout',
'setuptools',
'hexagonit.recipe.download',
'slapos.recipe.build>=0.32',
],
extras_require={
'test': ['zope.testing', 'manuel'],
......
import errno
from hashlib import md5
import hexagonit.recipe.download
import slapos.recipe.downloadunpacked
import imp
import logging
import os
......@@ -280,7 +280,7 @@ class Recipe(object):
for key in sorted(self.environ.keys()):
log.info('[ENV] %s = %s', key, self.environ[key])
# Download the source using hexagonit.recipe.download
# Download the source using slapos.recipe.downloadunpacked
if self.options['url']:
compile_dir = self.options['compile-directory']
if os.path.exists(compile_dir):
......@@ -291,7 +291,8 @@ class Recipe(object):
try:
opt = self.options.copy()
opt['destination'] = compile_dir
hexagonit.recipe.download.Recipe(
opt['strip-top-level-dir'] = 'False'
slapos.recipe.downloadunpacked.Recipe(
self.buildout, self.name, opt).install()
except:
shutil.rmtree(compile_dir)
......
......@@ -24,7 +24,7 @@ optionflags = (doctest.ELLIPSIS |
def setUp(test):
zc.buildout.testing.buildoutSetUp(test)
zc.buildout.testing.install('hexagonit.recipe.download', test)
zc.buildout.testing.install('slapos.recipe.build', test)
zc.buildout.testing.install_develop('slapos.recipe.cmmi', test)
class NonInformativeTests(unittest.TestCase):
......
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