summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-05-25 01:30:09 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-05-25 01:30:09 -0600
commitde1f6d3b16d6e833ec5df6e9f403aec7e2193962 (patch)
treefe20a76a56170837ceab7ebdd624af491ad87f19
parentaf138659e5042debbb57deba5c0419ba744f75fd (diff)
Use $(xbs name) instead of saying XBS.
-rwxr-xr-xdb-remove2
-rwxr-xr-xdb-update2
2 files changed, 2 insertions, 2 deletions
diff --git a/db-remove b/db-remove
index c4439a6..05b1750 100755
--- a/db-remove
+++ b/db-remove
@@ -34,7 +34,7 @@ for pkgbase in "${pkgbases[@]}"; do
remove_pkgs+=($(. "$path/PKGBUILD"; echo "${pkgname[@]}"))
xbs unrelease "$pkgbase" "$repo" "$arch"
else
- warning "%s not found in XBS %s" "$pkgbase" "$repo-$arch"
+ warning "%s not found in %s for %s" "$pkgbase" "$(xbs name)" "$repo-$arch"
warning "Removing only %s from the repo" "$pkgbase"
warning "If it was a split package you have to remove the others yourself!"
remove_pkgs+=("$pkgbase")
diff --git a/db-update b/db-update
index 57a2251..9b9b7b4 100755
--- a/db-update
+++ b/db-update
@@ -46,7 +46,7 @@ for repo in "${repos[@]}"; do
die "Package %s does not have a valid signature" "${repo}/${pkg##*/}"
fi
if ! check_pkgxbs "${pkg}" "${repo}"; then
- die "Package %s is not consistent with XBS" "${repo}/${pkg##*/}"
+ die "Package %s is not consistent with %s" "${repo}/${pkg##*/}" "$(xbs name)"
fi
if ! check_pkgrepos "${pkg}"; then
die "Package %s already exists in another repository" "${repo}/${pkg##*/}"