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.build
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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ayush Tiwari
slapos.recipe.build
Commits
ff70b8b7
Commit
ff70b8b7
authored
Aug 01, 2018
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use corretly log function
parent
7eca74fe
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
slapos/recipe/download.py
slapos/recipe/download.py
+2
-2
slapos/recipe/downloadunpacked.py
slapos/recipe/downloadunpacked.py
+2
-2
No files found.
slapos/recipe/download.py
View file @
ff70b8b7
...
...
@@ -73,7 +73,7 @@ class Recipe(object):
m
.
update
(
option_signature
)
shared
=
os
.
path
.
join
(
shared
,
m
.
hexdigest
())
self
.
_parts
=
parts
=
shared
log
.
info
(
'shared directory %s set for %s'
%
(
shared
,
name
)
)
log
.
info
(
'shared directory %s set for %s'
,
shared
,
name
)
else
:
self
.
_parts
=
parts
=
os
.
path
.
join
(
buildout_section
[
'parts-directory'
],
name
)
...
...
@@ -89,7 +89,7 @@ class Recipe(object):
parts
=
self
.
_parts
log
=
logging
.
getLogger
(
self
.
_name
)
if
self
.
_shared
:
log
.
info
(
'Checking whether package is installed at shared path: %s'
%
destination
)
log
.
info
(
'Checking whether package is installed at shared path: %s'
,
destination
)
if
os
.
path
.
exists
(
destination
):
log
.
info
(
'This shared package has been installed by other package'
)
return
[]
...
...
slapos/recipe/downloadunpacked.py
View file @
ff70b8b7
...
...
@@ -70,7 +70,7 @@ class Recipe:
m
.
update
(
option_signature
)
shared
=
os
.
path
.
join
(
shared
,
m
.
hexdigest
())
self
.
parts
=
shared
self
.
logger
.
info
(
'shared directory %s set for %s'
%
(
shared
,
name
)
)
self
.
logger
.
info
(
'shared directory %s set for %s'
,
shared
,
name
)
else
:
self
.
parts
=
os
.
path
.
join
(
self
.
buildout
[
'buildout'
][
'parts-directory'
],
self
.
name
)
...
...
@@ -100,7 +100,7 @@ class Recipe:
def
install
(
self
):
if
self
.
shared
:
self
.
logger
.
info
(
'Checking whether package is installed at shared path : %s'
%
self
.
destination
)
self
.
logger
.
info
(
'Checking whether package is installed at shared path : %s'
,
self
.
destination
)
if
os
.
path
.
exists
(
self
.
destination
):
self
.
logger
.
info
(
'This shared package has been installed by other package'
)
return
[]
...
...
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