YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

[fix] Home not created

Browse source
This commit is contained in:
ljf 2020-12-21 04:27:50 +01:00
parent 59d7e2f247
commit 8e2f1c696b
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
locales/en.json
View file

@ -627,7 +627,7 @@
"user_creation_failed": "Could not create user {user}: {error}",
"user_deleted": "User deleted",
"user_deletion_failed": "Could not delete user {user}: {error}",
"user_home_creation_failed": "Could not create 'home' folder for user",
"user_home_creation_failed": "Could not create '{home}' folder for user",
"user_unknown": "Unknown user: {user:s}",
"user_update_failed": "Could not update user {user}: {error}",
"user_updated": "User info changed",

21
src/yunohost/user.py
View file

@ -254,6 +254,10 @@ def user_create(
except subprocess.CalledProcessError:
if not os.path.isdir("/home/{0}".format(username)):
logger.warning(m18n.n("user_home_creation_failed"), exc_info=1)
home = '/home/{0}'.format(username)
if not os.path.isdir(home):
logger.warning(m18n.n('user_home_creation_failed', home=home),
exc_info=1)
try:
subprocess.check_call(
@ -726,6 +730,20 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
'errors': 0
}
def progress(info=""):
progress.nb += 1
width = 20
bar = int(progress.nb * width / total)
bar = "[" + "#" * bar + "." * (width - bar) + "]"
if info:
bar += " > " + info
if progress.old == bar:
return
progress.old = bar
logger.info(bar)
progress.nb = 0
progress.old = ""
def on_failure(user, exception):
result['errors'] += 1
logger.error(user + ': ' + str(exception))
@ -768,6 +786,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
result['deleted'] += 1
except YunohostError as e:
on_failure(user, e)
progress("Deletion")
for user in actions['updated']:
try:
@ -775,6 +794,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
result['updated'] += 1
except YunohostError as e:
on_failure(user['username'], e)
progress("Update")
for user in actions['created']:
try:
@ -786,6 +806,7 @@ def user_import(operation_logger, csvfile, update=False, delete=False):
result['created'] += 1
except YunohostError as e:
on_failure(user['username'], e)
progress("Creation")