equal
deleted
inserted
replaced
1131 // Adding drive letter of rom if not mentioned in stub sis file |
1131 // Adding drive letter of rom if not mentioned in stub sis file |
1132 TPtr a=fileName->Des(); |
1132 TPtr a=fileName->Des(); |
1133 if (a[0] == '!') |
1133 if (a[0] == '!') |
1134 { |
1134 { |
1135 TChar driveChar; |
1135 TChar driveChar; |
1136 iFs.DriveToChar(EDriveZ, driveChar); |
1136 User::LeaveIfError(iFs.DriveToChar(EDriveZ, driveChar)); |
1137 a[0] = driveChar; |
1137 a[0] = driveChar; |
1138 } |
1138 } |
1139 |
1139 |
1140 aFileNames.AppendL(fileName); |
1140 aFileNames.AppendL(fileName); |
1141 CleanupStack::Pop(fileName); |
1141 CleanupStack::Pop(fileName); |
1214 // Adding drive letter of rom if not mentioned in stub sis file |
1214 // Adding drive letter of rom if not mentioned in stub sis file |
1215 TPtr a=fileName->Des(); |
1215 TPtr a=fileName->Des(); |
1216 if (a[0] == '!') |
1216 if (a[0] == '!') |
1217 { |
1217 { |
1218 TChar driveChar; |
1218 TChar driveChar; |
1219 iFs.DriveToChar(EDriveZ, driveChar); |
1219 User::LeaveIfError(iFs.DriveToChar(EDriveZ, driveChar)); |
1220 a[0] = driveChar; |
1220 a[0] = driveChar; |
1221 } |
1221 } |
1222 |
1222 |
1223 aFileNames.AppendL(fileName); |
1223 aFileNames.AppendL(fileName); |
1224 CleanupStack::Pop(fileName); |
1224 CleanupStack::Pop(fileName); |
1326 |
1326 |
1327 if(!SisRegistryUtil::FileExistsL(iFs, firstBootMarkerFilePath)) |
1327 if(!SisRegistryUtil::FileExistsL(iFs, firstBootMarkerFilePath)) |
1328 { |
1328 { |
1329 // First boot detected. Add the first boot marker file as well as the format marker on the drive. |
1329 // First boot detected. Add the first boot marker file as well as the format marker on the drive. |
1330 SisRegistryUtil::CreateFileWithAttributesL(iFs, firstBootMarkerFilePath); |
1330 SisRegistryUtil::CreateFileWithAttributesL(iFs, firstBootMarkerFilePath); |
1331 SisRegistryUtil::CreateFileWithAttributesL(iFs, formatMarkerPath, fileAttributes); |
1331 TRAPD(err,SisRegistryUtil::CreateFileWithAttributesL(iFs, formatMarkerPath, fileAttributes);) |
|
1332 if (err != KErrNone && err != KErrAlreadyExists) |
|
1333 { |
|
1334 User::Leave(err); |
|
1335 } |
1332 } |
1336 } |
1333 else |
1337 else |
1334 { |
1338 { |
1335 // Subsequent boot. Check for the presence of a marker file <drive>\sys\install directory. |
1339 // Subsequent boot. Check for the presence of a marker file <drive>\sys\install directory. |
1336 // If absent, assume format. |
1340 // If absent, assume format. |