move and rename Common_config_files()
for better encapsulation, and for consistency with other config file handling functions in the new location. Gbp-Dch: Ignore
This commit is contained in:
parent
69dc8c21cb
commit
f78001144b
|
@ -9,6 +9,11 @@
|
|||
## under certain conditions; see COPYING for details.
|
||||
|
||||
|
||||
Common_conffiles ()
|
||||
{
|
||||
echo "config/all config/common config/bootstrap config/chroot config/binary config/source"
|
||||
}
|
||||
|
||||
Get_conffiles ()
|
||||
{
|
||||
local FILES
|
||||
|
|
|
@ -9,11 +9,6 @@
|
|||
## under certain conditions; see COPYING for details.
|
||||
|
||||
|
||||
Common_config_files ()
|
||||
{
|
||||
echo "config/all config/common config/bootstrap config/chroot config/binary config/source"
|
||||
}
|
||||
|
||||
Auto_build_config ()
|
||||
{
|
||||
# Automatically build config
|
||||
|
@ -27,7 +22,7 @@ Init_config_data ()
|
|||
{
|
||||
Arguments "${@}"
|
||||
|
||||
Read_conffiles $(Common_config_files)
|
||||
Read_conffiles $(Common_conffiles)
|
||||
Prepare_config
|
||||
|
||||
# Apt v2.0.1 introduced color support, but it needs to be explicitly enabled.
|
||||
|
|
|
@ -217,7 +217,7 @@ Local_arguments ()
|
|||
fi
|
||||
|
||||
# Dump conffile contents
|
||||
Print_conffiles $(Common_config_files)
|
||||
Print_conffiles $(Common_conffiles)
|
||||
|
||||
# Dump contents of directories that contain text files
|
||||
local DIRECTORY
|
||||
|
@ -939,7 +939,7 @@ then
|
|||
fi
|
||||
|
||||
# Reading existing saved configuration
|
||||
Read_conffiles $(Common_config_files)
|
||||
Read_conffiles $(Common_conffiles)
|
||||
|
||||
# Processing arguments again to overwrite just-read previously saved settings as necessary
|
||||
Local_arguments "${@}"
|
||||
|
|
Loading…
Reference in New Issue