Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.recipe.cmmi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
slapos.recipe.cmmi
Commits
f2940c5b
Commit
f2940c5b
authored
Mar 08, 2017
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use slapos.recipe.build:downloadunpacked instead of hexagonit.recipe.download.
parent
98f1574c
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
setup.py
setup.py
+1
-1
slapos/recipe/cmmi/__init__.py
slapos/recipe/cmmi/__init__.py
+4
-3
slapos/recipe/cmmi/tests.py
slapos/recipe/cmmi/tests.py
+1
-1
No files found.
setup.py
View file @
f2940c5b
...
@@ -50,7 +50,7 @@ setup(
...
@@ -50,7 +50,7 @@ setup(
install_requires
=
[
install_requires
=
[
'zc.buildout'
,
'zc.buildout'
,
'setuptools'
,
'setuptools'
,
'
hexagonit.recipe.download
'
,
'
slapos.recipe.build>=0.32
'
,
],
],
extras_require
=
{
extras_require
=
{
'test'
:
[
'zope.testing'
,
'manuel'
],
'test'
:
[
'zope.testing'
,
'manuel'
],
...
...
slapos/recipe/cmmi/__init__.py
View file @
f2940c5b
import
errno
import
errno
from
hashlib
import
md5
from
hashlib
import
md5
import
hexagonit.recipe.downloa
d
import
slapos.recipe.downloadunpacke
d
import
imp
import
imp
import
logging
import
logging
import
os
import
os
...
@@ -280,7 +280,7 @@ class Recipe(object):
...
@@ -280,7 +280,7 @@ class Recipe(object):
for
key
in
sorted
(
self
.
environ
.
keys
()):
for
key
in
sorted
(
self
.
environ
.
keys
()):
log
.
info
(
'[ENV] %s = %s'
,
key
,
self
.
environ
[
key
])
log
.
info
(
'[ENV] %s = %s'
,
key
,
self
.
environ
[
key
])
# Download the source using
hexagonit.recipe.downloa
d
# Download the source using
slapos.recipe.downloadunpacke
d
if
self
.
options
[
'url'
]:
if
self
.
options
[
'url'
]:
compile_dir
=
self
.
options
[
'compile-directory'
]
compile_dir
=
self
.
options
[
'compile-directory'
]
if
os
.
path
.
exists
(
compile_dir
):
if
os
.
path
.
exists
(
compile_dir
):
...
@@ -291,7 +291,8 @@ class Recipe(object):
...
@@ -291,7 +291,8 @@ class Recipe(object):
try
:
try
:
opt
=
self
.
options
.
copy
()
opt
=
self
.
options
.
copy
()
opt
[
'destination'
]
=
compile_dir
opt
[
'destination'
]
=
compile_dir
hexagonit
.
recipe
.
download
.
Recipe
(
opt
[
'strip-top-level-dir'
]
=
'False'
slapos
.
recipe
.
downloadunpacked
.
Recipe
(
self
.
buildout
,
self
.
name
,
opt
).
install
()
self
.
buildout
,
self
.
name
,
opt
).
install
()
except
:
except
:
shutil
.
rmtree
(
compile_dir
)
shutil
.
rmtree
(
compile_dir
)
...
...
slapos/recipe/cmmi/tests.py
View file @
f2940c5b
...
@@ -24,7 +24,7 @@ optionflags = (doctest.ELLIPSIS |
...
@@ -24,7 +24,7 @@ optionflags = (doctest.ELLIPSIS |
def
setUp
(
test
):
def
setUp
(
test
):
zc
.
buildout
.
testing
.
buildoutSetUp
(
test
)
zc
.
buildout
.
testing
.
buildoutSetUp
(
test
)
zc
.
buildout
.
testing
.
install
(
'
hexagonit.recipe.downloa
d'
,
test
)
zc
.
buildout
.
testing
.
install
(
'
slapos.recipe.buil
d'
,
test
)
zc
.
buildout
.
testing
.
install_develop
(
'slapos.recipe.cmmi'
,
test
)
zc
.
buildout
.
testing
.
install_develop
(
'slapos.recipe.cmmi'
,
test
)
class
NonInformativeTests
(
unittest
.
TestCase
):
class
NonInformativeTests
(
unittest
.
TestCase
):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment