Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-09 13:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for bug 12510.

Browse Source
This commit is contained in:
sgehani%netscape.com 1999-08-31 01:15:26 +00:00
parent c67d934ba7
commit 7e5e37e98e
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
xpinstall/src/nsInstall.cpp
View File

@ -281,6 +281,18 @@ nsInstall::AddDirectory(const nsString& aRegName,
return NS_OK;
}
nsString qualifiedVersion = aVersion;
if (qualifiedVersion == "")
{
// assume package version for overriden forms that don't take version info
*aReturn = mVersionInfo->ToString(qualifiedVersion);
}
if (*aReturn != SUCCESS)
{
return NS_OK;
}
nsString subdirectory(aSubdir);
if (subdirectory != "")
@ -328,7 +340,7 @@ nsInstall::AddDirectory(const nsString& aRegName,
ie = new nsInstallFile( this,
fullRegName,
aVersion,
qualifiedVersion,
newJarSource,
aFolder,
newSubDir,
@ -417,6 +429,7 @@ nsInstall::AddSubcomponent(const nsString& aRegName,
{
nsInstallFile* ie;
nsString qualifiedRegName;
nsString qualifiedVersion;
nsString tempTargetName;
PRInt32 errcode = nsInstall::SUCCESS;
@ -444,6 +457,17 @@ nsInstall::AddSubcomponent(const nsString& aRegName,
return NS_OK;
}
qualifiedVersion = aVersion;
if (qualifiedVersion == "")
{
// assume package version for overriden forms that don't take version info
*aReturn = mVersionInfo->ToString(qualifiedVersion);
}
if (*aReturn != SUCCESS)
{
return NS_OK;
}
if ( aRegName == "" || aRegName == "null")
{
@ -463,7 +487,7 @@ nsInstall::AddSubcomponent(const nsString& aRegName,
ie = new nsInstallFile( this,
qualifiedRegName,
aVersion,
qualifiedVersion,
aJarSource,
aFolder,
tempTargetName,