X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcepackage.cpp;h=f59b353d74d0c3edd5dc6e52409e61c9083fab64;hb=3e8bf5032e744b5fc3e7680af48f2abacc67addc;hp=4f42051e6b654d9baac64fabde7bb44e479e6ebe;hpb=8fa75f16e653e22f188bc09c5d04c3cdb5cf8c52;p=builder.git diff --git a/source/sourcepackage.cpp b/source/sourcepackage.cpp index 4f42051..f59b353 100644 --- a/source/sourcepackage.cpp +++ b/source/sourcepackage.cpp @@ -181,7 +181,7 @@ void SourcePackage::init_config() void SourcePackage::create_build_info() { - build_info.add(builder.get_current_arch().get_build_info()); + build_info.update_from(builder.get_current_arch().get_build_info()); // XXX Currently, a package-specific settings will override cmdline. This might or might not be desirable. const StringList &warnings = builder.get_warnings(); @@ -216,7 +216,7 @@ void SourcePackage::create_build_info() for(ConditionList::iterator i=conditions.begin(); i!=conditions.end(); ++i) if(i->eval()) - build_info.add(i->get_build_info()); + build_info.update_from(i->get_build_info()); build_info.unique();