Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2019-01-17 12:47:45 -0500
committerGitHub <noreply@github.com>2019-01-17 12:47:45 -0500
commit81faae5cd21d7932030cf5faf8c3eb76745a2af7 (patch)
treee07c8d694c8169e1fd9d8152465670158381c0b1
parentab3449f5ac7c5682520bc13a439c1d37ca2953ae (diff)
parent36732e5441313234068dd49b3494aea62f3a6b4b (diff)
Merge pull request #26 from ThePiGrepper/ups/exp/fixes
parsing issue and missing function
-rw-r--r--asp.in2
-rw-r--r--package.inc.sh6
2 files changed, 5 insertions, 3 deletions
diff --git a/asp.in b/asp.in
index 69c3bdc..25bb7b7 100644
--- a/asp.in
+++ b/asp.in
@@ -156,7 +156,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 1ae9a5b..7af7a82 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
@@ -177,7 +177,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/)
}