Skip to content
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

Jump to bottom

fix: on error, reset spawnedProcess #41033

Merged
merged 1 commit into from Jan 24, 2024
Merged

fix: on error, reset spawnedProcess #41033

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/browser/api/auto-updater/squirrel-update-win.ts
View file
Open in desktop
Expand Up @@ -38,6 +38,8 @@
spawnedProcess.stderr.on('data', (data) => { stderr += data; });

spawnedProcess.on('error', (error) => {
spawnedProcess = undefined;
spawnedArgs = [];
reject(error);
});

Expand All @@ -49,11 +51,11 @@
// Process terminated with error.
reject(new Error(`Command failed: ${signal ?? code}\n${stderr}`));
} else {
// Success.
resolve(stdout);
}
});
});

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 26-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 26-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 27-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 27-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 28-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error

Check failure on line 58 in lib/browser/api/auto-updater/squirrel-update-win.ts

View check run for this annotation

trop / Backportable? - 28-x-y

lib/browser/api/auto-updater/squirrel-update-win.ts#L54-L58 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +  errorEmitted = false;
 +  spawnedProcess.on('error', (error) => {
 +    errorEmitted = true;
 +    callback(error);
 +  });
++=======
+     spawnedProcess.on('error', (error) => {
+       spawnedProcess = undefined;
+       spawnedArgs = [];
+       reject(error);
+     });
++>>>>>>> reset spawnedProcess instance in case of error
};

// Start an instance of the installed app.
Expand Down