|
Lines 776-787
Link Here
|
| 776 |
map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); |
776 |
map<string,any> read_config = Kiwi::ReadConfigXML (kiwi_configuration); |
| 777 |
if (!KiwiConfig["_imported"]:false) |
777 |
if (!KiwiConfig["_imported"]:false) |
| 778 |
{ |
778 |
{ |
| 779 |
KiwiConfig = (map<string,any>) union (KiwiConfig, read_config); |
779 |
KiwiConfig = (map<string,any>) union ( |
|
|
780 |
// "type" had different meaning in ProductCreator::Config... |
| 781 |
remove (KiwiConfig, "type"), read_config); |
| 780 |
// for new configuration, do not read all from the template |
782 |
// for new configuration, do not read all from the template |
| 781 |
y2milestone ("product-creator based configuration..."); |
783 |
y2milestone ("product-creator based configuration..."); |
| 782 |
foreach (string key, ["addons", "packages", "sources"], { |
784 |
foreach (string key, ["addons", "packages", "sources"], { |
| 783 |
KiwiConfig[key] = ProductCreator::Config[key]:[]; |
785 |
KiwiConfig[key] = ProductCreator::Config[key]:[]; |
| 784 |
}); |
786 |
}); |
|
|
787 |
KiwiConfig["name"] = ProductCreator::Config["name"]:""; |
| 785 |
} |
788 |
} |
| 786 |
else |
789 |
else |
| 787 |
{ |
790 |
{ |