Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-01-17 23:10:13 +0100
committerErich Eckner <git@eckner.net>2019-01-17 23:10:13 +0100
commitc4de3d676c5bbbad4ea1b25c80e3221203df1dc3 (patch)
tree97e514f06ef1c36d0fcad332ea707ba319b870d9
parent89a50089759b73965e0dddaa5846b1c9a2ad69b3 (diff)
parent81faae5cd21d7932030cf5faf8c3eb76745a2af7 (diff)
Merge branch 'upstream/master'
-rw-r--r--asp32.in2
-rw-r--r--package.inc.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/asp32.in b/asp32.in
index b5471d8..e467a3e 100644
--- a/asp32.in
+++ b/asp32.in
@@ -160,7 +160,7 @@ dump_packages() {
dumpfn=remote_get_tracked_refs
;;
*)
- die 'internal error: invalid dump type: "%s"' "$1"
+ log_fatal 'BUG: invalid dump type: "%s"' "$1"
;;
esac
diff --git a/package.inc.sh b/package.inc.sh
index 109a75e..4d1ab7b 100644
--- a/package.inc.sh
+++ b/package.inc.sh
@@ -74,7 +74,7 @@ package_log() {
logargs=()
;;
*)
- die 'internal error: unknown log method: %s' "$method"
+ log_fatal 'BUG: unknown log method: %s' "$method"
;;
esac
@@ -183,7 +183,9 @@ package_get_repos_with_arch() {
pkgname=$1
while read -r path; do
- IFS=/- read -r _ repo arch <<<"$path"
+ path=${path##*/}
+ repo=${path%-*}
+ arch=${path##*-}
printf '%s %s\n' "$repo" "$arch"
done < <(git ls-tree --name-only "remotes/$remote/packages/$pkgname" repos/)
}