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
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
Commits
3333b07d
Commit
3333b07d
authored
Aug 07, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression in GenericBaseRecipe.generatePassword
parent
2baf68e6
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
slapos/recipe/librecipe/generic.py
slapos/recipe/librecipe/generic.py
+4
-3
No files found.
slapos/recipe/librecipe/generic.py
View file @
3333b07d
...
@@ -188,7 +188,7 @@ class GenericBaseRecipe(object):
...
@@ -188,7 +188,7 @@ class GenericBaseRecipe(object):
# In the long-term, it's probably better that passwords are provided
# In the long-term, it's probably better that passwords are provided
# by software requesters, to avoid keeping unhashed secrets in
# by software requesters, to avoid keeping unhashed secrets in
# partitions when possible.
# partitions when possible.
log
.
warning
(
"GenericBaseRecipe.generatePassword is deprecated."
self
.
logger
.
warning
(
"GenericBaseRecipe.generatePassword is deprecated."
" Use generate.password recipe instead."
)
" Use generate.password recipe instead."
)
return
"insecure"
return
"insecure"
...
@@ -243,7 +243,8 @@ class GenericBaseRecipe(object):
...
@@ -243,7 +243,8 @@ class GenericBaseRecipe(object):
destination
=
self
.
location
destination
=
self
.
location
if
os
.
path
.
exists
(
destination
):
if
os
.
path
.
exists
(
destination
):
# leftovers from a previous failed attempt, removing it.
# leftovers from a previous failed attempt, removing it.
log
.
warning
(
'Removing already existing directory %s'
%
destination
)
self
.
logger
.
warning
(
'Removing already existing directory %s'
,
destination
)
shutil
.
rmtree
(
destination
)
shutil
.
rmtree
(
destination
)
os
.
mkdir
(
destination
)
os
.
mkdir
(
destination
)
...
...
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