wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-28 01:57:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Remove maintenance service bits from nsUpdateDriver

Browse source 
Tag #145
This commit is contained in:
wolfbeast 2019-02-20 12:47:09 +01:00 • committed by Roy Tam
commit 8c796ed5d8
1 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

19
toolkit/xre/nsUpdateDriver.cpp
View file

@ -212,10 +212,8 @@ GetStatusFileContents(nsIFile *statusFile, char (&buf)[Size])
typedef enum { typedef enum {
eNoUpdateAction, eNoUpdateAction,
ePendingUpdate, ePendingUpdate,
ePendingService,
ePendingElevate, ePendingElevate,
eAppliedUpdate, eAppliedUpdate,
eAppliedService,
} UpdateStatus; } UpdateStatus;
/** /**
@ -233,22 +231,14 @@ GetUpdateStatus(nsIFile* dir, nsCOMPtr<nsIFile> &statusFile)
char buf[32]; char buf[32];
if (GetStatusFileContents(statusFile, buf)) { if (GetStatusFileContents(statusFile, buf)) {
const char kPending[] = "pending"; const char kPending[] = "pending";
const char kPendingService[] = "pending-service";
const char kPendingElevate[] = "pending-elevate"; const char kPendingElevate[] = "pending-elevate";
const char kApplied[] = "applied"; const char kApplied[] = "applied";
const char kAppliedService[] = "applied-service";
if (!strncmp(buf, kPendingElevate, sizeof(kPendingElevate) - 1)) { if (!strncmp(buf, kPendingElevate, sizeof(kPendingElevate) - 1)) {
return ePendingElevate; return ePendingElevate;
} }
if (!strncmp(buf, kPendingService, sizeof(kPendingService) - 1)) {
return ePendingService;
}
if (!strncmp(buf, kPending, sizeof(kPending) - 1)) { if (!strncmp(buf, kPending, sizeof(kPending) - 1)) {
return ePendingUpdate; return ePendingUpdate;
} }
if (!strncmp(buf, kAppliedService, sizeof(kAppliedService) - 1)) {
return eAppliedService;
}
if (!strncmp(buf, kApplied, sizeof(kApplied) - 1)) { if (!strncmp(buf, kApplied, sizeof(kApplied) - 1)) {
return eAppliedUpdate; return eAppliedUpdate;
} }
@ -760,9 +750,6 @@ ApplyUpdate(nsIFile *greDir, nsIFile *updateDir, nsIFile *statusFile,
// We used to write out "Applying" to the update.status file here. // We used to write out "Applying" to the update.status file here.
// Instead we do this from within the updater application now. // Instead we do this from within the updater application now.
// This is so that we don't overwrite the status of pending-service
// in the Windows case. This change was made for all platforms so
// that it stays consistent across all OS.
// On platforms where we are not calling execv, we may need to make the // On platforms where we are not calling execv, we may need to make the
// updater executable wait for the calling process to exit. Otherwise, the // updater executable wait for the calling process to exit. Otherwise, the
@ -969,17 +956,15 @@ ProcessUpdates(nsIFile *greDir, nsIFile *appDir, nsIFile *updRootDir,
} }
break; break;
} }
// Intentional fallthrough to ePendingUpdate and ePendingService. // Intentional fallthrough to ePendingUpdate.
MOZ_FALLTHROUGH; MOZ_FALLTHROUGH;
} }
case ePendingUpdate: case ePendingUpdate: {
case ePendingService: {
ApplyUpdate(greDir, updatesDir, statusFile, appDir, argc, argv, restart, ApplyUpdate(greDir, updatesDir, statusFile, appDir, argc, argv, restart,
isOSUpdate, osApplyToDir, pid); isOSUpdate, osApplyToDir, pid);
break; break;
} }
case eAppliedUpdate: case eAppliedUpdate:
case eAppliedService:
// An update was staged and needs to be switched so the updated application // An update was staged and needs to be switched so the updated application
// is used. // is used.
SwitchToUpdatedApp(greDir, updatesDir, appDir, argc, argv); SwitchToUpdatedApp(greDir, updatesDir, appDir, argc, argv);