Commit 3333b07d authored by Julien Muchembled's avatar Julien Muchembled

Fix regression in GenericBaseRecipe.generatePassword

parent 2baf68e6
...@@ -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)
......
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