Merge branch 'upstream/master'

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/)
 }