equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). |
2 * Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies). |
3 * All rights reserved. |
3 * All rights reserved. |
4 * This component and the accompanying materials are made available |
4 * This component and the accompanying materials are made available |
5 * under the terms of the License "Eclipse Public License v1.0" |
5 * under the terms of the License "Eclipse Public License v1.0" |
6 * which accompanies this distribution, and is available |
6 * which accompanies this distribution, and is available |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
7 * at the URL "http://www.eclipse.org/legal/epl-v10.html". |
148 { |
148 { |
149 SisRegistryProperty* p = new SisRegistryProperty(props[i]); |
149 SisRegistryProperty* p = new SisRegistryProperty(props[i]); |
150 iProperties.push_back(p); |
150 iProperties.push_back(p); |
151 } |
151 } |
152 |
152 |
153 const const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps = |
153 const CSISArray<CSISDependency, CSISFieldRoot::ESISDependency>& deps = |
154 aSis.GetDependencies()->DependencyList(); |
154 aSis.GetDependencies()->DependencyList(); |
155 |
155 |
156 for(i = 0; i < deps.size(); ++i) |
156 for(i = 0; i < deps.size(); ++i) |
157 { |
157 { |
158 SisRegistryDependency* p = new SisRegistryDependency(deps[i]); |
158 SisRegistryDependency* p = new SisRegistryDependency(deps[i]); |
406 { |
406 { |
407 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
407 iVendorLocalizedName = new std::wstring(aSisController.SISInfo().VendorName(0)); |
408 } |
408 } |
409 else |
409 else |
410 { |
410 { |
411 std::string x; |
|
412 std::string error = "can not retrieve localized vendor name"; |
411 std::string error = "can not retrieve localized vendor name"; |
413 throw InvalidSis(Ucs2ToUtf8((std::wstring)packageName,x), error, INVALID_SIS); |
412 std::string x = wstring2string((std::wstring)packageName); |
|
413 throw InvalidSis(x, error, INVALID_SIS); |
414 } |
414 } |
415 |
415 |
416 // Signed by SU cert |
416 // Signed by SU cert |
417 iSignedBySuCert = false; |
417 iSignedBySuCert = false; |
418 |
418 |