File tree Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Expand file tree Collapse file tree 2 files changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -182,10 +182,6 @@ func CreateOrganization(org, owner *User) (err error) {
182
182
return fmt .Errorf ("insert team-user relation: %v" , err )
183
183
}
184
184
185
- if err = os .MkdirAll (UserPath (org .Name ), os .ModePerm ); err != nil {
186
- return fmt .Errorf ("create directory: %v" , err )
187
- }
188
-
189
185
return sess .Commit ()
190
186
}
191
187
Original file line number Diff line number Diff line change @@ -798,8 +798,6 @@ func CreateUser(u *User) (err error) {
798
798
799
799
if _ , err = sess .Insert (u ); err != nil {
800
800
return err
801
- } else if err = os .MkdirAll (UserPath (u .Name ), os .ModePerm ); err != nil {
802
- return err
803
801
}
804
802
805
803
return sess .Commit ()
@@ -898,7 +896,12 @@ func ChangeUserName(u *User, newUserName string) (err error) {
898
896
return fmt .Errorf ("Delete repository wiki local copy: %v" , err )
899
897
}
900
898
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
902
905
}
903
906
904
907
// checkDupEmail checks whether there are the same email with the user
You can’t perform that action at this time.
0 commit comments