Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

99670 r=dprice sr=mscott a=dbaron patch by dveditz

Browse Source 
Install.addDirectory() now reports correct error


git-svn-id: svn://10.0.0.236/trunk@115267 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dprice%netscape.com 2002-02-23 03:57:25 +00:00
parent f780c9a84e
commit bb303fcebc
1 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
mozilla/xpinstall/src/nsInstall.cpp
View File

@ -420,22 +420,16 @@ nsInstall::AddDirectory(const nsString& aRegName,
return NS_OK;
}
PRInt32 count = 0;
result = ExtractDirEntries(aJarSource, paths);
if (result != nsInstall::SUCCESS)
if (result == nsInstall::SUCCESS)
{
*aReturn = SaveError( result );
return NS_OK;
count = paths->Count();
if (count == 0)
result = nsInstall::DOES_NOT_EXIST;
}
PRInt32 count = paths->Count();
if (count == 0)
{
*aReturn = SaveError( nsInstall::DOES_NOT_EXIST );
return NS_OK;
}
for (PRInt32 i=0; i < count; i++)
for (PRInt32 i=0; i < count && result == nsInstall::SUCCESS; i++)
{
nsString *thisPath = (nsString *)paths->ElementAt(i);
@ -464,19 +458,16 @@ nsInstall::AddDirectory(const nsString& aRegName,
if (ie == nsnull)
{
*aReturn = SaveError(nsInstall::OUT_OF_MEMORY);
return NS_OK;
result = nsInstall::OUT_OF_MEMORY;
}
if (result == nsInstall::SUCCESS)
{
result = ScheduleForInstall( ie );
}
else
else if (result != nsInstall::SUCCESS)
{
delete ie;
}
else
{
result = ScheduleForInstall( ie );
}
}
DeleteVector(paths);