equal
deleted
inserted
replaced
352 TRAPD(err, iMetaData = iSWIBackup.GetMetaDataL(iPackageID, iFiles)); |
352 TRAPD(err, iMetaData = iSWIBackup.GetMetaDataL(iPackageID, iFiles)); |
353 |
353 |
354 if(KErrNotSupported == err) |
354 if(KErrNotSupported == err) |
355 {//Non-Removable package, nothing to backup |
355 {//Non-Removable package, nothing to backup |
356 iState.iState = ENone; |
356 iState.iState = ENone; |
|
357 aLastSection = ETrue; |
357 Cleanup(); |
358 Cleanup(); |
358 return; |
359 return; |
359 } |
360 } |
360 else if(KErrNone != err) |
361 else if(KErrNone != err) |
361 { |
362 { |
362 iState.iState = ENone; |
363 iState.iState = ENone; |
|
364 aLastSection = ETrue; |
363 Cleanup(); |
365 Cleanup(); |
364 User::Leave(err); |
366 User::Leave(err); |
365 } |
367 } |
366 |
368 |
367 iMetaDataSize = iMetaData->Size(); |
369 iMetaDataSize = iMetaData->Size(); |
1411 __LOG1("CPackageDataTransfer::GetDriveListL() - Begin - SID: 0x%08x", iPackageID.iUid); |
1413 __LOG1("CPackageDataTransfer::GetDriveListL() - Begin - SID: 0x%08x", iPackageID.iUid); |
1412 |
1414 |
1413 // We now no longer return the Z drive, it has been decided that the Z drive will always be the |
1415 // We now no longer return the Z drive, it has been decided that the Z drive will always be the |
1414 // ROM. Backing up and restoring the ROM drive should not be possible, as what is the point |
1416 // ROM. Backing up and restoring the ROM drive should not be possible, as what is the point |
1415 |
1417 |
1416 // build package files |
1418 // build package files |
1417 if (iMetaData == NULL) |
1419 if (iMetaData == NULL) |
1418 { |
1420 { |
1419 iMetaData = iSWIBackup.GetMetaDataL(iPackageID, iFiles); |
1421 TRAPD( err, iMetaData = iSWIBackup.GetMetaDataL(iPackageID, iFiles) ); |
1420 iMetaDataSize = iMetaData->Size(); |
1422 |
1421 BuildPackageFileList(); |
1423 if( err ) |
|
1424 { |
|
1425 iMetaData = NULL; |
|
1426 iMetaDataSize = 0; |
|
1427 User::Leave( err ); |
|
1428 } |
|
1429 else |
|
1430 { |
|
1431 iMetaDataSize = iMetaData->Size(); |
|
1432 BuildPackageFileList(); |
|
1433 } |
1422 } |
1434 } |
1423 |
1435 |
1424 TDriveList notToBackup = ipDataOwnerManager->Config().ExcludeDriveList(); |
1436 TDriveList notToBackup = ipDataOwnerManager->Config().ExcludeDriveList(); |
1425 |
1437 |
1426 for (TInt i = 0; i < KMaxDrives; i++) |
1438 for (TInt i = 0; i < KMaxDrives; i++) |
1431 iDriveList[i] = EFalse; |
1443 iDriveList[i] = EFalse; |
1432 } |
1444 } |
1433 } |
1445 } |
1434 |
1446 |
1435 aDriveList = iDriveList; |
1447 aDriveList = iDriveList; |
|
1448 |
1436 __LOG1("CPackageDataTransfer::GetDriveListL() - end - SID: 0x%08x", iPackageID.iUid); |
1449 __LOG1("CPackageDataTransfer::GetDriveListL() - end - SID: 0x%08x", iPackageID.iUid); |
1437 } |
1450 } |
1438 |
1451 |
1439 TBool CPackageDataTransfer::IsExcluded(const TBool aIsPublic, const TDesC& aFileName, const RArray<TPtrC>& aExclude) |
1452 TBool CPackageDataTransfer::IsExcluded(const TBool aIsPublic, const TDesC& aFileName, const RArray<TPtrC>& aExclude) |
1440 /** Checks to see if a given file is excluded |
1453 /** Checks to see if a given file is excluded |