equal
deleted
inserted
replaced
1 // Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies). |
1 // Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies). |
2 // All rights reserved. |
2 // All rights reserved. |
3 // This component and the accompanying materials are made available |
3 // This component and the accompanying materials are made available |
4 // under the terms of "Eclipse Public License v1.0" |
4 // under the terms of "Eclipse Public License v1.0" |
5 // which accompanies this distribution, and is available |
5 // which accompanies this distribution, and is available |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
6 // at the URL "http://www.eclipse.org/legal/epl-v10.html". |
483 TPtr installDirFilePath(filePath->Des()); |
483 TPtr installDirFilePath(filePath->Des()); |
484 installDirFilePath.Append(*TServerResources::iDataDirectory); |
484 installDirFilePath.Append(*TServerResources::iDataDirectory); |
485 installDirFilePath.Append(KInstallDirFile); |
485 installDirFilePath.Append(KInstallDirFile); |
486 |
486 |
487 TRAPD(err, ReadAndInternalizeInstallDirL(installDirFilePath)); // try to open installdir file and internalize its contents |
487 TRAPD(err, ReadAndInternalizeInstallDirL(installDirFilePath)); // try to open installdir file and internalize its contents |
488 if (err != KErrNone) |
488 if (err != KErrNone && err != KErrNotFound && err != KErrPathNotFound) |
489 { |
489 { |
490 TInt fileDeleteErr = TServerResources::iFs.Delete(installDirFilePath); |
490 TInt fileDeleteErr = TServerResources::iFs.Delete(installDirFilePath); |
491 // If a debug build - record error |
491 // If a debug build - record error |
492 #ifdef _DEBUG |
492 #ifdef _DEBUG |
493 if (fileDeleteErr != KErrNone && err != KErrNotFound) |
493 if (fileDeleteErr != KErrNone && err != KErrNotFound) |