Merge branch 'master' into lukeshu/xbs

Conflicts:
	any-to-ours
	create-repo
	cron-jobs/ftpdir-cleanup
	cron-jobs/repo-sanity-check
	cron-jobs/sourceballs
	cron-jobs/sourceballs2
	db-check-nonfree
	db-cleanup
	db-functions
	db-move
	db-remove
	db-sync
	db-update
	libremessages
	testing2x

1 files changed, 2 insertions, 2 deletions

diff --git a/db-cleanup b/db-cleanup
index 413ce06..54c1ba8 100755
--- a/db-cleanup
+++ b/db-cleanup
@@ -33,7 +33,7 @@ trap "rm -f -- $(printf %q "$filter")" EXIT
 
 for _repo in "${PKGREPOS[@]}"; do
 	for _arch in "${ARCHES[@]}"; do
-		msg "Getting %s database" "${_repo}-${_arch}"
+		msg "Getting %s-%s database" "${_repo}" "${_arch}"
 
 		dbfile="${FTP_BASE}/${_repo}/os/${_arch}/${_repo}${DBEXT}"
 
@@ -54,7 +54,7 @@ done
 msg "Removing old files:"
 
 for POOL in "${PKGPOOLS[@]}" "${SRCPOOLS[@]}"; do
-	msg2 "${POOL}"
+	msg2 '%s' "${POOL}"
 
 	rsync "${EXTRAFLAGS[@]}" -va --delete-excluded \
 		--include-from="$filter" \