equal
deleted
inserted
replaced
341 |
341 |
342 // check file directly: |
342 // check file directly: |
343 // aaa$bbb -> aaa$bbb.install |
343 // aaa$bbb -> aaa$bbb.install |
344 CDir* dir = NULL; |
344 CDir* dir = NULL; |
345 iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); |
345 iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); |
346 if( dir->Count() > 0 ) |
346 if( dir && dir->Count() > 0 ) |
347 { |
347 { |
348 // brand is installed |
348 // brand is installed |
349 delete dir; |
349 delete dir; |
350 TRACE( T_LIT( "CBSInstallHandler::IsBrandInstalled true") ); |
350 TRACE( T_LIT( "CBSInstallHandler::IsBrandInstalled true") ); |
351 return ETrue; |
351 return ETrue; |
360 file.Append( KBrandInstallExt ); |
360 file.Append( KBrandInstallExt ); |
361 |
361 |
362 // check file with different versions: |
362 // check file with different versions: |
363 // aaa$bbb -> aaa$bbb$*.install |
363 // aaa$bbb -> aaa$bbb$*.install |
364 iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); |
364 iFs.GetDir( file, KEntryAttNormal, ESortNone, dir ); |
365 if( dir->Count() > 0 ) |
365 if( dir && dir->Count() > 0 ) |
366 { |
366 { |
367 // brand is installed |
367 // brand is installed |
368 delete dir; |
368 delete dir; |
369 TRACE( T_LIT( "CBSInstallHandler::IsBrandInstalled true") ); |
369 TRACE( T_LIT( "CBSInstallHandler::IsBrandInstalled true") ); |
370 return ETrue; |
370 return ETrue; |