Merge pull request #1009 from AladW/ignore-pkgspec

sync: use pkgspec for ignores instead of pacini
pull/1010/head
Alad Wenter 3 months ago committed by GitHub
commit b6cb567470
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 21
      lib/aur-sync
  2. 3
      makepkg/aurutils.changelog

@ -29,6 +29,16 @@ lib32() {
}' "$@"
}
split_pkgspec() {
awk -F'/' '{
if (NF == 2) {
printf("%s\t%s\n", $1, $2)
} else {
printf("-\t%s\n", $1)
}
}' "$@"
}
# argv[1]: $1 pkgname $2 depends $3 pkgbase
# note: edges are not checked for duplicates
select_pkgbase() {
@ -270,13 +280,10 @@ fi
: "${ignore_file=$XDG_CONFIG_HOME/aurutils/sync/ignore}"
{ if [[ -r $ignore_file ]] && [[ ! -d $ignore_file ]]; then
mapfile -t isect < <(pacini "$ignore_file" --section-list)
if (( ${#isect[@]} )); then
pacini "$ignore_file" --section="$db_name"
else
pacini "$ignore_file"
fi
# Restrict ignores to local repository with single pass (#880)
while IFS=$'\t' read -r repo pkg; do
[[ $repo == "$db_name" || $repo == "-" ]] && pkg_i+=("$pkg")
done < <(split_pkgspec "$ignore_file")
fi
if (( ${#pkg_i[@]} )); then

@ -41,6 +41,9 @@
+ remove `-E`, `--env` (deprecated in v8)
* `aur-sync`
+ use pkgspec `<REPOSITORY>/<PACKAGE>` format for `--ignore-file`
- support for sections (introduced with v6.3) is removed (#880)
- <PACKAGE> ignores apply to all local repositories
+ add `--rebase`, `--reset` options for `aur-fetch`
+ exit 22 on dependency cycles (v7 regression)
+ filter dependency graph by pkgname, not depends (v7 regression)

Loading…
Cancel
Save