equal
deleted
inserted
replaced
954 if (err != KErrNone) |
954 if (err != KErrNone) |
955 { |
955 { |
956 RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - ERROR leaving cannot connect installer: %d", err ); |
956 RDEBUG_2( "CApplicationManagementServer::PrepareInstallL - ERROR leaving cannot connect installer: %d", err ); |
957 User::LeaveIfError(err); |
957 User::LeaveIfError(err); |
958 } |
958 } |
959 CleanupClosePushL(iInstaller); |
959 |
960 #endif |
960 #endif |
961 |
961 |
962 RDEBUG( "CApplicationManagementServer::PrepareInstallL - connected to installer" ); |
962 RDEBUG( "CApplicationManagementServer::PrepareInstallL - connected to installer" ); |
963 // Copy data file name (install file) |
963 // Copy data file name (install file) |
964 if (aComponent.Data().DataFileName().Length() > 0) |
964 if (aComponent.Data().DataFileName().Length() > 0) |
1065 { |
1065 { |
1066 res = EFalse; |
1066 res = EFalse; |
1067 RDEBUG( "CApplicationManagementServer::PrepareInstallL - ERROR size of source file is 0!" ); |
1067 RDEBUG( "CApplicationManagementServer::PrepareInstallL - ERROR size of source file is 0!" ); |
1068 } |
1068 } |
1069 |
1069 |
1070 #ifndef __AM_CONNECT_INSTALLER_ONSTARTUP_ |
|
1071 CleanupStack::Pop( &iInstaller); |
|
1072 #endif |
|
1073 |
1070 |
1074 RDEBUG( "CApplicationManagementServer::PrepareInstallL end" ); |
1071 RDEBUG( "CApplicationManagementServer::PrepareInstallL end" ); |
1075 return res; |
1072 return res; |
1076 } |
1073 } |
1077 |
1074 |