Skip to content

Commit 709e86e

Browse files
committed
Manually merge PR142 to skip creation of client_id subdir in user_pending state dir during account creation.
git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6158 b75ad72c-e7d7-11dd-a971-7dbc132099af
1 parent 3766076 commit 709e86e

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

mig/shared/useradm.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ def _get_required_user_dir_links(configuration, real_dir, link_dir):
221221
settings_dir = os.path.join(configuration.user_settings, real_dir)
222222
cache_dir = os.path.join(configuration.user_cache, real_dir)
223223
mrsl_dir = os.path.join(configuration.mrsl_files_dir, real_dir)
224-
user_pending_dir = os.path.join(configuration.user_pending, real_dir)
225224
res_pending_dir = os.path.join(configuration.resource_pending, real_dir)
226225
if link_dir:
227226
home_link = os.path.join(configuration.user_home, link_dir)
@@ -234,11 +233,9 @@ def _get_required_user_dir_links(configuration, real_dir, link_dir):
234233
home_link = settings_link = cache_link = mrsl_link = False
235234
res_pending_link = False
236235

237-
# No link in user pending as that is before user has UUID
238-
user_pending_link = None
236+
# No content or link in user pending as that is before user has UUID
239237
dir_links = [(home_dir, home_link), (settings_dir, settings_link),
240238
(cache_dir, cache_link), (mrsl_dir, mrsl_link),
241-
(user_pending_dir, user_pending_link),
242239
(res_pending_dir, res_pending_link)]
243240
return dir_links
244241

0 commit comments

Comments
 (0)