diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-08 00:15:23 -0600 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-06-08 00:15:23 -0600 |
| commit | cdf74b6f4f40fa81d9d5445ab2b80903c7854f17 (patch) | |
| tree | d744df25d46f4e4e7762209536d2d68ce1ad6999 /db-functions | |
| parent | e960e11bfb0d74cf545595ebfabe4965e3a5b1ed (diff) | |
| parent | 780c57ec14e7ccbf8695ccc159bbee49cf17e237 (diff) | |
Merge branch 'master' into lukeshu/xbs
# Conflicts:
# abslibre
# any-to-ours
# config
# db-cleanup
# db-functions
# db-libremessages
# db-move
# db-sync
Diffstat (limited to 'db-functions')
| -rw-r--r-- | db-functions | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/db-functions b/db-functions index b0bdb28..62260bb 100644 --- a/db-functions +++ b/db-functions @@ -421,12 +421,13 @@ arch_repo_add() { local arch=$2 local pkgs=("${@:3}") + printf -v pkgs_str -- '%q ' "${pkgs[@]}" # package files might be relative to repo dir pushd "${FTP_BASE}/${repo}/os/${arch}" >/dev/null /usr/bin/repo-add -q "${repo}${DBEXT}" "${pkgs[@]}" \ - || error '%s' "repo-add ${repo}${DBEXT} ${pkgs[*]}" + || error 'repo-add %q %s' "${repo}${DBEXT}" "${pkgs_str% }" /usr/bin/repo-add -f -q "${repo}${FILESEXT}" "${pkgs[@]}" \ - || error '%s' "repo-add -f ${repo}${FILESEXT} ${pkgs[*]}" + || error 'repo-add -f %q %s' "${repo}${FILESEXT}" "${pkgs_str% }" popd >/dev/null set_repo_permission "${repo}" "${arch}" @@ -444,10 +445,11 @@ arch_repo_remove() { error "No database found at '%s'" "${dbfile}" return 1 fi + printf -v pkgs_str -- '%q ' "${pkgs[@]}" /usr/bin/repo-remove -q "${dbfile}" "${pkgs[@]}" \ - || error '%s' "repo-remove ${dbfile} ${pkgs[*]}" + || error 'repo-remove %q %s' "${dbfile}" "${pkgs_str% }" /usr/bin/repo-remove -q "${filesfile}" "${pkgs[@]}" \ - || error '%s' "repo-remove ${filesfile} ${pkgs[*]}" + || error 'repo-remove %q %s' "${filesfile}" "${pkgs_str% }" set_repo_permission "${repo}" "${arch}" REPO_MODIFIED=1 |