[pacman-dev] [PATCH] asdeps flag passed from makepkg to pacman

Dan McGee dpmcgee at gmail.com
Mon May 7 16:49:16 EDT 2012


On Mon, May 7, 2012 at 3:47 PM, Daniel Wallace
<daniel.wallace at gatech.edu> wrote:
> From: Daniel Wallace <daniel.wallace12 at gmail.com>
>
> add the asdeps flag for makepkg so that it does pacman -U --asdeps for
> when you have to make the dependencies as well because they are not in
> the repos
>
> Signed-off-by: Daniel Wallace <daniel.wallace12 at gmail.com>

This is done unconditionally already...

http://projects.archlinux.org/pacman.git/tree/scripts/makepkg.sh.in#n511

> ---
>  contrib/bash_completion.in |    4 ++--
>  contrib/zsh_completion.in  |    1 +
>  doc/makepkg.8.txt          |    4 ++++
>  scripts/makepkg.sh.in      |    4 +++-
>  4 files changed, 10 insertions(+), 3 deletions(-)
>
> diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in
> index 1b265e0..0bf6e39 100644
> --- a/contrib/bash_completion.in
> +++ b/contrib/bash_completion.in
> @@ -75,8 +75,8 @@ _makepkg() {
>   _get_comp_words_by_ref cur prev
>   if [[ $cur = -* && ! $prev =~ ^-(-(config|help)$|\w*[Chp]) ]]; then
>     opts=('allsource asroot check clean config force geninteg help holdver ignorearch
> -           install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar
> -           nosign pkg repackage rmdeps sign skipinteg source syncdeps'
> +           install log nobuild nocheck nocolor noconfirm asdeps nodeps noextract
> +           noprogressbar nosign pkg repackage rmdeps sign skipinteg source syncdeps'
>           'A L R S c d e f g h i m o p r s')
>     _arch_ptr2comp opts
>   fi
> diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
> index 2de47cd..e81257b 100644
> --- a/contrib/zsh_completion.in
> +++ b/contrib/zsh_completion.in
> @@ -484,6 +484,7 @@ _makepkg_longopts=(
>   '--skipinteg[do not perform any verification checks on source files]'
>   '--skippgpcheck[Do not verify source files with PGP signatures]'
>   '--noconfirm[do not ask for confirmation when resolving dependencies]'
> +  '--asdeps[Install packages as non-explicitly installed]'
>   '--noprogressbar[Do not show a progress bar when downloading files]'
>   )
>  _makepkg(){
> diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
> index 27875a3..b96d768 100644
> --- a/doc/makepkg.8.txt
> +++ b/doc/makepkg.8.txt
> @@ -179,6 +179,10 @@ Options
>        (Passed to pacman) Prevent pacman from waiting for user input before
>        proceeding with operations.
>
> +*\--asdeps*::
> +       (Passed to pacman) Install packages as non-explicitly installed (used
> +       with -i / --install).
> +
>  *\--noprogressbar*::
>        (Passed to pacman) Prevent pacman from displaying a progress bar;
>        useful if you are redirecting makepkg output to file.
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index d36dbd6..e17dc0a 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -1969,6 +1969,7 @@ usage() {
>        printf -- "$(gettext "These options can be passed to %s:")\n" "pacman"
>        echo
>        printf -- "$(gettext "  --noconfirm      Do not ask for confirmation when resolving dependencies")\n"
> +       printf -- "$(gettext "  --asdeps         Install packages as non-explicitly installed")\n"
>        printf -- "$(gettext "  --noprogressbar  Do not show a progress bar when downloading files")\n"
>        echo
>        printf -- "$(gettext "If %s is not specified, %s will look for '%s'")\n" "-p" "makepkg" "$BUILDSCRIPT"
> @@ -2004,7 +2005,7 @@ OPT_LONG=('allsource' 'asroot' 'ignorearch' 'check' 'clean' 'nodeps'
>           'version' 'config:')
>
>  # Pacman Options
> -OPT_LONG+=('noconfirm' 'noprogressbar')
> +OPT_LONG+=('noconfirm' 'asdeps' 'noprogressbar')
>
>  if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
>        exit 1 # E_INVALID_OPTION;
> @@ -2016,6 +2017,7 @@ while true; do
>        case "$1" in
>                # Pacman Options
>                --noconfirm)      PACMAN_OPTS+=" --noconfirm" ;;
> +               --asdeps)         PACMAN_OPTS+=" --asdeps" ;;
>                --noprogressbar)  PACMAN_OPTS+=" --noprogressbar" ;;
>
>                # Makepkg Options
> --
> 1.7.10.1
>
>


More information about the pacman-dev mailing list