From 0c00f4efe8961ceb69287d2a0f2e3fa3f3ceca0c Mon Sep 17 00:00:00 2001 From: Alad Wenter Date: Wed, 13 Mar 2024 00:35:48 +0100 Subject: [PATCH] depends: use --no-verify by default Matches the <19 behavior --- lib/aur-depends | 4 ++-- lib/aur-sync | 2 +- makepkg/aurutils.changelog | 5 ++--- man1/aur-depends.1 | 10 +++++----- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/aur-depends b/lib/aur-depends index 888b7eac..fbc0c1b9 100755 --- a/lib/aur-depends +++ b/lib/aur-depends @@ -79,7 +79,7 @@ unless(caller) { my $opt_show_all = 0; # implies $opt_pkgname = 1 my $opt_reverse = 0; my $opt_provides = 1; - my $opt_verify = 1; + my $opt_verify = 0; my $opt_installed = []; GetOptions( @@ -89,7 +89,7 @@ unless(caller) { 'no-checkdepends' => sub { $opt_checkdepends = 0 }, 'optdepends' => \$opt_optdepends, 'no-provides' => sub { $opt_provides = 0 }, - 'no-verify' => sub { $opt_verify = 0 }, + 'v|verify' => \$opt_verify, 'n|pkgname' => \$opt_pkgname, 'b|pkgbase' => sub { $opt_pkgname = 0 }, 'G|graph' => sub { }, # noop diff --git a/lib/aur-sync b/lib/aur-sync index f928cc63..6816b2b7 100755 --- a/lib/aur-sync +++ b/lib/aur-sync @@ -357,7 +357,7 @@ if [[ -s $tmp/argv ]]; then # depends: $1 pkgname $2 required_by $3 pkgbase $4 pkgver $5 depends_type # XXX: dependency requirements are already computed by `aur-graph` below # (possibly after local changes). Use `depends --no-verify` accordingly. - aur depends --table --reverse --no-verify \ + aur depends --table --reverse \ "${depends_args[@]}" - <"$tmp"/argv >"$tmp"/depends else printf >&2 '%s: there is nothing to do\n' "$argv0" diff --git a/makepkg/aurutils.changelog b/makepkg/aurutils.changelog index 0b191c85..a98ae1b1 100644 --- a/makepkg/aurutils.changelog +++ b/makepkg/aurutils.changelog @@ -1,17 +1,16 @@ ## 19 * `aur-build` - + early check for buildscript + add `--cleanbuild` + do not shell quote `--status` paths + + early check for buildscript * `aur-chroot` + do not shell quote `--status` paths * `aur-depends` - + verify dependency version requirements by default + only include `Self` targets for command-line arguments (`--table`, #1136) - + add `--no-verify` + + verify dependency version requirements (`--verify`) * `aur-graph` + prevent unwanted matches in certain URLs (#1134) diff --git a/man1/aur-depends.1 b/man1/aur-depends.1 index f2226ba4..bb9b8803 100644 --- a/man1/aur-depends.1 +++ b/man1/aur-depends.1 @@ -117,11 +117,11 @@ option. Multiple packages can be specified by separating them with a comma. . .PP -By default, dependency requirements are checked with -.BR vercmp (8). -This can be disabled with the -.B \-\-no\-verify -option. +Dependency requirements are checked with +.BR vercmp (8) +if the +.B \-\-verify +option is specified. . .SH NOTES While versioned dependencies are listed, they are ignored when -- 2.11.4.GIT