Skip to content

W-17672123 fix: prevent duplicate MSO after table #1267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mdonnalley merged 2 commits into from
Jan 15, 2025
Merged

W-17672123 fix: prevent duplicate MSO after table #1267

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f0dde3
fix: prevent duplicate MSO after table
mdonnalley Jan 13, 2025
083e636
chore: always stop stages in catch
mdonnalley Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/commands/project/deploy/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {

const result = await deploy.pollStatus({ timeout: flags.wait });
process.exitCode = determineExitCode(result);
this.stages.stop();
const formatter = new DeployResultFormatter(result, flags);

if (!this.jsonEnabled()) {
Expand All @@ -292,10 +293,11 @@ export default class DeployMetadata extends SfCommand<DeployResultJson> {
}

protected catch(error: Error | SfError): Promise<never> {
this.stages?.update({ status: 'Failed' });
this.stages?.error();

if (error instanceof SourceConflictError && error.data) {
if (!this.jsonEnabled()) {
this.stages?.update({ status: 'Failed' });
this.stages?.error();
writeConflictTable(error.data);
// set the message and add plugin-specific actions
return super.catch({
Expand Down
Loading