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, 4 insertions, 7 deletions

diff --git a/create-repo b/create-repo
index cfdbc23..3feb098 100755
--- a/create-repo
+++ b/create-repo
@@ -5,20 +5,17 @@
 . "$(dirname "$(readlink -e "$0")")/db-functions"
 
 if [ $# -eq 0 ]; then
-	msg "Usage: ${0##*/} repo1 [repo2 ... repoX]"
+	msg "Usage: %s repo1 [repo2 ... repoX]" "${0##*/}"
 	exit 1
 fi
 
 msg "Creating repos..."
 for _repo in "$@"; do
-	msg2 "Creating [${_repo}]"
-	mkdir -p "${FTP_BASE}/staging/${_repo}" || \
-		error "Failed creating staging dir"
-
+	msg2 "Creating [%s]" "${_repo}"
 	for _arch in "${ARCHES[@]}"; do
 		mkdir -p "${FTP_BASE}/${_repo}/os/${_arch}" || \
-			error "Failed creating ${_arch} dir"
+			error "Failed creating %s dir" "${_arch}"
 	done
 done
 
-msg "Don't forget to add them to the PKGREPOS array on %s/config" "$(dirname "$(readlink -e "$0")")"
+msg "Don't forget to add them to the PKGREPOS array on %s" "$(dirname "$(readlink -e "$0")")/config"