config: apt-get should probably be an allowed and documented --apt value
since everywhere where 'apt' is a permitted value, 'apt-get' is also, it just wasn't listed in the option's documentation and thus was also not listed in the new validation check. Gbp-Dch: Short
This commit is contained in:
parent
c57b8679a4
commit
c3f0d39675
|
@ -587,7 +587,7 @@ Validate_config_permitted_values ()
|
|||
exit 1
|
||||
fi
|
||||
|
||||
if ! In_list "${LB_APT}" apt aptitude; then
|
||||
if ! In_list "${LB_APT}" apt apt-get aptitude; then
|
||||
Echo_error "You have specified an invalid value for LB_APT (--apt)."
|
||||
exit 1
|
||||
fi
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
.PP
|
||||
\fBlb config\fR
|
||||
.br
|
||||
[\fB\-\-apt\fR apt|aptitude]
|
||||
[\fB\-\-apt\fR apt|apt-get|aptitude]
|
||||
.br
|
||||
[\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR]
|
||||
.br
|
||||
|
@ -250,7 +250,7 @@ Note: \fBlb config\fR tries to be smart and sets defaults for some options depen
|
|||
.SH OPTIONS
|
||||
In addition to its specific options \fBlb config\fR understands all generic live\-build options. See \fIlive\-build\fR(7) for a complete list of all generic live\-build options.
|
||||
.PP
|
||||
.IP "\fB\-\-apt\fR apt|aptitude" 4
|
||||
.IP "\fB\-\-apt\fR apt|apt-get|aptitude" 4
|
||||
defines if apt\-get or aptitude is used to install packages when building the image. The default is apt.
|
||||
.IP "\fB\-\-apt\-ftp\-proxy\fR \fIURL\fR" 4
|
||||
sets the FTP proxy to be used by apt. By default, this is empty. Note that this variable is only for the proxy that gets used by apt internally within the chroot, it is not used for anything else.
|
||||
|
|
|
@ -17,7 +17,7 @@ set -e
|
|||
# Setting static variables
|
||||
PROGRAM="lb config"
|
||||
DESCRIPTION="Create configuration for live-build(7)"
|
||||
USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
||||
USAGE="${PROGRAM} [--apt apt|apt-get|aptitude]\n\
|
||||
\t [--apt-ftp-proxy URL]\n\
|
||||
\t [--apt-http-proxy URL]\n\
|
||||
\t [--apt-indices true|false]\n\
|
||||
|
|
Loading…
Reference in New Issue