Skip to content

Commit bac353d

Browse files
committed
Fix bug
1 parent 52b6d13 commit bac353d

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

routers/web/repo/setting.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,22 +202,24 @@ func SettingsPost(ctx *context.Context) {
202202
}
203203
}
204204

205-
u, _ := git.GetRemoteAddress(ctx, ctx.Repo.Repository.RepoPath(), ctx.Repo.Mirror.GetRemoteName())
205+
u, err := git.GetRemoteAddress(ctx, ctx.Repo.Repository.RepoPath(), ctx.Repo.Mirror.GetRemoteName())
206+
if err != nil {
207+
ctx.Data["Err_MirrorAddress"] = true
208+
handleSettingRemoteAddrError(ctx, err, form)
209+
return
210+
}
206211
if u.User != nil && form.MirrorPassword == "" && form.MirrorUsername == u.User.Username() {
207212
form.MirrorPassword, _ = u.User.Password()
208213
}
209214

210-
address, err := forms.ParseRemoteAddr(form.MirrorAddress, form.MirrorUsername, form.MirrorPassword)
211-
if err == nil {
212-
err = migrations.IsMigrateURLAllowed(address, ctx.Doer)
213-
}
215+
err = migrations.IsMigrateURLAllowed(u.String(), ctx.Doer)
214216
if err != nil {
215217
ctx.Data["Err_MirrorAddress"] = true
216218
handleSettingRemoteAddrError(ctx, err, form)
217219
return
218220
}
219221

220-
if err := mirror_service.UpdateAddress(ctx, ctx.Repo.Mirror, address); err != nil {
222+
if err := mirror_service.UpdateAddress(ctx, ctx.Repo.Mirror, u.String()); err != nil {
221223
ctx.ServerError("UpdateAddress", err)
222224
return
223225
}

services/mirror/mirror_pull.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
214214
remoteAddr, remoteErr := git.GetRemoteAddress(ctx, repoPath, m.GetRemoteName())
215215
if remoteErr != nil {
216216
log.Error("SyncMirrors [repo: %-v]: GetRemoteAddress Error %v", m.Repo, remoteErr)
217+
return nil, false
217218
}
218219

219220
stdoutBuilder := strings.Builder{}

0 commit comments

Comments
 (0)