makepkg.sh.in - if both -r and -i are provided, only remove makedeps
 

On Sat, Feb 4, 2012 at 8:07 AM, <andrew.gregory.8@gmail.com> wrote:
> From: Andrew Gregory <andrew.gregory.8@gmail.com>
Allan- master for this, looking at your working branches? That's fine
with me, although it seems low-risk enough to pull to maint.

-Dan

> ---
> *scripts/makepkg.sh.in | * *6 +++++-
> *1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 8274255..91457fd 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -2305,13 +2305,17 @@ if (( NODEPS || ( (NOBUILD || REPKG) && !DEP_BIN ) )); then
> * * * * * * * *warning "$(gettext "Skipping dependency checks.")"
> * * * *fi
> *elif type -p "${PACMAN%% *}" >/dev/null; then
> - * * * if (( RMDEPS )); then
> + * * * if (( RMDEPS && ! INSTALL )); then
> * * * * * * * *original_pkglist=($(run_pacman -Qq)) * *# required by remove_dep
> * * * *fi
> * * * *deperr=0
>
> * * * *msg "$(gettext "Checking runtime dependencies...")"
> * * * *resolve_deps ${depends[@]} || deperr=1
> +
> + * * * if (( RMDEPS && INSTALL )); then
> + * * * * * * * original_pkglist=($(run_pacman -Qq)) * *# required by remove_dep
> + * * * fi
>
> * * * *msg "$(gettext "Checking buildtime dependencies...")"
> * * * *resolve_deps ${makedepends[@]} || deperr=1
> --
> 1.7.9
>
>

makepkg.sh.in - if both -r and -i are provided, only remove makedeps
 

On 06/02/12 21:36, Dan McGee wrote:
> On Sat, Feb 4, 2012 at 8:07 AM, <andrew.gregory.8@gmail.com> wrote:
>> From: Andrew Gregory <andrew.gregory.8@gmail.com>
> Allan- master for this, looking at your working branches? That's fine
> with me, although it seems low-risk enough to pull to maint.

I am happy either way. I flagged it for master because it was a
behaviour change, although I can not see anybody relying on the old
behaviour...

Allan