config: tweak config file loading order

load the base set of files first, then any user arch/dist specific override
files second.

this is important since whenever config items get moved in the base files,
this can break the override files, if an option specified in one was moved
to a different common file that it loaded after.

Gbp-Dch: Ignore
This commit is contained in:
Lyndon Brown 2020-05-02 20:44:02 +01:00
parent 640a25f78d
commit 23ed83e730
1 changed files with 2 additions and 1 deletions

View File

@ -21,9 +21,10 @@ Get_conffiles ()
then
FILES="${LB_CONFIG}"
else
# List standard files first, then possible user arch/dist overrides
FILES="${@}"
local FILE
for FILE in "${@}"; do
FILES="${FILES} ${FILE}"
FILES="${FILES} ${LB_ARCHITECTURE:+$FILE.$LB_ARCHITECTURE}"
FILES="${FILES} ${LB_DISTRIBUTION:+$FILE.$LB_DISTRIBUTION}"
done