Skip to content

Commit dc1bdad

Browse files
ronlv4Ron Levi
andauthored
[ACR] az acr login: Fix login status code when command fails (#31692)
Co-authored-by: Ron Levi <[email protected]>
1 parent c7e2df9 commit dc1bdad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

doc/how_to_introduce_breaking_changes.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,13 @@ This way, the pre-announcement wouldn't be displayed unless running into the bra
319319
Before you publish the breaking changes, you need to make sure that the announcement is ready for the Upcoming Breaking Change Documentation. To do that, run this command:
320320

321321
```commandline
322-
azdev genereate-breaking-change-report
322+
azdev generate-breaking-change-report
323323
```
324324

325325
If your breaking change is not for the next breaking change window, you can see all the announcements by using `--target-version None` like this:
326326

327327
```commandline
328-
azdev genereate-breaking-change-report --target-version None
328+
azdev generate-breaking-change-report --target-version None
329329
```
330330

331331
The output should be a JSON object including the pre-announcement you made.
@@ -347,5 +347,5 @@ The Upcoming Breaking Change Documentation includes:
347347
The documentation is generated through `azdev` tool. You can preview the documentation locally through the following command.
348348

349349
```commandline
350-
azdev genereate-breaking-change-report CLI --output-format markdown
350+
azdev generate-breaking-change-report CLI --output-format markdown
351351
```

src/azure-cli/azure/cli/command_modules/acr/custom.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ def acr_login(cmd,
355355
_, stderr = p.communicate()
356356
return_code = p.returncode
357357

358-
if stderr:
358+
if stderr or return_code != 0: # when docker command process returns non-zero
359359
if b'error storing credentials' in stderr and b'stub received bad data' in stderr \
360360
and _check_wincred(login_server):
361361
# Retry once after disabling wincred

0 commit comments

Comments
 (0)