Skip to content

Commit 303d7f7

Browse files
SagePtrtechknowlogick
authored andcommitted
Do not autocreate directory for new user/orgs (#4828) (#4849)
1 parent 3c6cc56 commit 303d7f7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

models/org.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@ func CreateOrganization(org, owner *User) (err error) {
182182
return fmt.Errorf("insert team-user relation: %v", err)
183183
}
184184

185-
if err = os.MkdirAll(UserPath(org.Name), os.ModePerm); err != nil {
186-
return fmt.Errorf("create directory: %v", err)
187-
}
188-
189185
return sess.Commit()
190186
}
191187

models/user.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -798,8 +798,6 @@ func CreateUser(u *User) (err error) {
798798

799799
if _, err = sess.Insert(u); err != nil {
800800
return err
801-
} else if err = os.MkdirAll(UserPath(u.Name), os.ModePerm); err != nil {
802-
return err
803801
}
804802

805803
return sess.Commit()
@@ -898,7 +896,12 @@ func ChangeUserName(u *User, newUserName string) (err error) {
898896
return fmt.Errorf("Delete repository wiki local copy: %v", err)
899897
}
900898

901-
return os.Rename(UserPath(u.Name), UserPath(newUserName))
899+
// Do not fail if directory does not exist
900+
if err = os.Rename(UserPath(u.Name), UserPath(newUserName)); err != nil && !os.IsNotExist(err) {
901+
return fmt.Errorf("Rename user directory: %v", err)
902+
}
903+
904+
return nil
902905
}
903906

904907
// checkDupEmail checks whether there are the same email with the user

0 commit comments

Comments
 (0)