summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcron-jobs/repo-sanity-check8
-rwxr-xr-xcron-jobs/sourceballs22
-rwxr-xr-xdb-check-nonfree2
-rw-r--r--db-functions4
-rwxr-xr-xdb-update2
5 files changed, 8 insertions, 10 deletions
diff --git a/cron-jobs/repo-sanity-check b/cron-jobs/repo-sanity-check
index 012b544..86f9629 100755
--- a/cron-jobs/repo-sanity-check
+++ b/cron-jobs/repo-sanity-check
@@ -1,5 +1,5 @@
#!/bin/bash
-# Solves issue165
+# Solves issue165... on the old flyspray install. I have no idea what issue that was.
. "$(dirname "$(readlink -e "$0")")/../config"
. "$(dirname "$(readlink -e "$0")")/../db-functions"
@@ -46,12 +46,10 @@ for _repo in "${PKGREPOS[@]}"; do
<(printf '%s\n' "${on_repo[@]}" | sort -u) ))
# Remove them from databases, ftpdir-cleanup will take care of the rest
- find "${FTP_BASE}/${_repo}" -name "*.db.tar.?z" -exec \
- repo-remove {} "${remove[@]}" >/dev/null 2>&1 \;
+ find "${FTP_BASE}/${_repo}" -name "*.db.tar.?z" \
+ -exec repo-remove {} "${remove[@]}" >/dev/null 2>&1 \;
msg2 "Removed the following packages:"
plain '%s' "${remove[@]}"
done
-
-exit $?
diff --git a/cron-jobs/sourceballs2 b/cron-jobs/sourceballs2
index c431e9f..e935f86 100755
--- a/cron-jobs/sourceballs2
+++ b/cron-jobs/sourceballs2
@@ -13,7 +13,7 @@ pushd "${WORKDIR}" >/dev/null
script_lock
-#adjust the nice level to run at a lower priority
+# Adjust the nice level to run at a lower priority
renice +10 -p $$ > /dev/null
# Create a list of all available source package file names
diff --git a/db-check-nonfree b/db-check-nonfree
index c1673c3..37b7cf6 100755
--- a/db-check-nonfree
+++ b/db-check-nonfree
@@ -4,7 +4,7 @@
. "$(dirname "$(readlink -e "$0")")/db-functions"
if [ $# -ge 1 ]; then
- warning "Calling %s with a specific repository is not supported" "${0##*/}"
+ error "Calling %s with a specific repository is not supported" "${0##*/}"
exit 1
fi
diff --git a/db-functions b/db-functions
index 51fc1bd..accc508 100644
--- a/db-functions
+++ b/db-functions
@@ -188,7 +188,7 @@ repo_lock () {
while [ "$_count" -le "$_trial" ] || "$_lockblock" ; do
if ! mkdir "$LOCKDIR" >/dev/null 2>&1 ; then
_owner="$(/usr/bin/stat -c %U "$LOCKDIR")"
- warning "Repo [%s] (%s) is already locked by %s." "$1" "$2" "$_owner"
+ warning "Repo [%s] (%s) is already locked by %s." "${1}" "${2}" "$_owner"
msg2 "Retrying in %d seconds..." "$LOCK_DELAY"
else
LOCKS+=("$1.$2")
@@ -490,7 +490,7 @@ set_repo_permission() {
if [ -w "${dbfile}" ]; then
local group=$(/usr/bin/stat --printf='%G' "$(dirname "${dbfile}")")
- chgrp "$group" "${dbfile}" || error "Could not change group of %s to %s" "${dbfile}" "$group"
+ chgrp "$group" "${dbfile}" || error "Could not change group of %s to %s" "${dbfile}" "$group"
chgrp "$group" "${filesfile}" || error "Could not change group of %s to %s" "${filesfile}" "$group"
chmod g+w "${dbfile}" || error "Could not set write permission for group %s to %s" "$group" "${dbfile}"
chmod g+w "${filesfile}" || error "Could not set write permission for group %s to %s" "$group" "${filesfile}"
diff --git a/db-update b/db-update
index ced673e..4d2cace 100755
--- a/db-update
+++ b/db-update
@@ -58,7 +58,7 @@ for repo in "${repos[@]}"; do
arch_pkgs=($(getpkgfiles "${STAGING}/${repo}/"*-"${pkgarch}"${PKGEXT} 2>/dev/null))
for pkg in "${arch_pkgs[@]}" "${any_pkgs[@]}"; do
pkgfile="${pkg##*/}"
- msg2 '%s (%s)' "${pkgfile}" "${pkgarch}"
+ msg2 "%s (%s)" "${pkgfile}" "${pkgarch}"
# any packages might have been moved by the previous run
if [ -f "${pkg}" ]; then
mv "${pkg}" "$FTP_BASE/${PKGPOOL}"