Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
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
zhifan huang
slapos
Commits
87648549
Commit
87648549
authored
Oct 01, 2019
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wrapper recipe: accept hash-files already generated inside partition directory
parent
0e0e8d19
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
slapos/recipe/wrapper.py
slapos/recipe/wrapper.py
+3
-2
No files found.
slapos/recipe/wrapper.py
View file @
87648549
...
@@ -26,7 +26,6 @@
...
@@ -26,7 +26,6 @@
##############################################################################
##############################################################################
import
os
,
shlex
import
os
,
shlex
from
six.moves
import
filter
from
slapos.recipe.librecipe
import
GenericBaseRecipe
,
generateHashFromFiles
from
slapos.recipe.librecipe
import
GenericBaseRecipe
,
generateHashFromFiles
from
zc.buildout
import
UserError
from
zc.buildout
import
UserError
...
@@ -51,7 +50,9 @@ class Recipe(GenericBaseRecipe):
...
@@ -51,7 +50,9 @@ class Recipe(GenericBaseRecipe):
hash_files
=
options
.
get
(
'hash-files'
)
hash_files
=
options
.
get
(
'hash-files'
)
if
hash_files
:
if
hash_files
:
self
.
hash_files
=
hash_files
.
split
()
self
.
hash_files
=
hash_files
.
split
()
self
.
_existing
=
list
(
filter
(
os
.
path
.
exists
,
self
.
hash_files
))
prefix
=
os
.
path
.
realpath
(
buildout
[
'buildout'
][
'directory'
])
+
os
.
sep
self
.
_existing
=
[
x
for
x
in
self
.
hash_files
if
os
.
path
.
exists
(
x
)
and
not
os
.
path
.
realpath
(
x
).
startswith
(
prefix
)]
else
:
else
:
self
.
hash_files
=
[]
self
.
hash_files
=
[]
hash_files
=
options
.
get
(
'hash-existing-files'
)
hash_files
=
options
.
get
(
'hash-existing-files'
)
...
...
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