Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit2807a9d

Browse files
committed
consistency
1 parente72c98f commit2807a9d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

‎agent/agentcontainers/api.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,8 +1141,8 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
11411141
returnxerrors.Errorf("read devcontainer config: %w",err)
11421142
}
11431143

1144-
ignore:=config.Configuration.Customizations.Coder.Ignore
1145-
ifignore {
1144+
dcIgnored:=config.Configuration.Customizations.Coder.Ignore
1145+
ifdcIgnored {
11461146
proc.stop()
11471147
ifproc.agent.ID!=uuid.Nil {
11481148
// Unlock while doing the delete operation.
@@ -1158,7 +1158,7 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
11581158
proc.agent=SubAgent{}
11591159
proc.containerID=""
11601160
api.injectedSubAgentProcs[dc.WorkspaceFolder]=proc
1161-
api.ignoredDevcontainers[dc.WorkspaceFolder]=ignore
1161+
api.ignoredDevcontainers[dc.WorkspaceFolder]=dcIgnored
11621162
returnnil
11631163
}
11641164
}
@@ -1201,10 +1201,10 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
12011201
ranSubAgent:=false
12021202

12031203
// Clean up if injection fails.
1204-
varignored,setIgnoredbool
1204+
vardcIgnored,setDCIgnoredbool
12051205
deferfunc() {
1206-
ifsetIgnored {
1207-
api.ignoredDevcontainers[dc.WorkspaceFolder]=ignored
1206+
ifsetDCIgnored {
1207+
api.ignoredDevcontainers[dc.WorkspaceFolder]=dcIgnored
12081208
}
12091209
if!ranSubAgent {
12101210
proc.stop()
@@ -1284,8 +1284,8 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
12841284

12851285
// We only allow ignore to be set in the root customization layer to
12861286
// prevent weird interactions with devcontainer features.
1287-
ignored,setIgnored=config.Configuration.Customizations.Coder.Ignore,true
1288-
ifignored {
1287+
dcIgnored,setDCIgnored=config.Configuration.Customizations.Coder.Ignore,true
1288+
ifdcIgnored {
12891289
returnnil
12901290
}
12911291

@@ -1337,7 +1337,7 @@ func (api *API) maybeInjectSubAgentIntoContainerLocked(ctx context.Context, dc c
13371337
api.logger.Error(ctx,"unable to read devcontainer config",slog.Error(err))
13381338
}
13391339

1340-
ifignored {
1340+
ifdcIgnored {
13411341
proc.stop()
13421342
ifproc.agent.ID!=uuid.Nil {
13431343
// If we stop the subagent, we also need to delete it.

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp