Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 12242

Browse Source
This commit is contained in:
dveditz%netscape.com 1999-08-30 22:08:32 +00:00
parent 33dfa6bea9
commit 2286632b40
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
xpinstall/src/nsInstallPatch.cpp
View File

@ -259,7 +259,11 @@ PRInt32 nsInstallPatch::Complete()
mInstall->GetPatch(&ikey, &fileName);
if (fileName != nsnull && (*fileName == *mPatchedFile) )
if (fileName == nsnull)
{
err = nsInstall::UNEXPECTED_ERROR;
}
else if (*fileName == *mPatchedFile)
{
// the patch has not been superceded--do final replacement
err = ReplaceFileNowOrSchedule( *mPatchedFile, *mTargetFile);
@ -271,10 +275,13 @@ PRInt32 nsInstallPatch::Complete()
char* tempRegName = mRegistryName->ToNewCString();
char* tempVersion = tempVersionString.ToNewCString();
err = VR_Install( tempRegName,
(char*) (const char *) nsNSPRPath(*mTargetFile),
tempVersion,
PR_FALSE );
// DO NOT propogate version registry errors, it will abort
// FinalizeInstall() leaving things hosed. These piddly errors
// aren't worth that.
VR_Install( tempRegName,
(char*) (const char *) nsNSPRPath(*mTargetFile),
tempVersion,
PR_FALSE );
if (tempRegName) delete [] tempRegName;
if (tempVersion) delete [] tempVersion;
@ -330,7 +337,7 @@ nsInstallPatch::CanUninstall()
PRBool
nsInstallPatch::RegisterPackageNode()
{
return PR_FALSE;
return PR_TRUE;
}