diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-18 14:06:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-06-18 14:06:59 -0400 |
| commit | 32786b02317f9018ae6e1b7aa069763e9496a834 (patch) | |
| tree | de25210cbb95470239e20105f7225d0ffd1d7beb /cron-jobs/sourceballs | |
| parent | cc3720b21451fbf73e0075b0955653fb37d1e106 (diff) | |
| parent | 3abd3eaf4b3e6495d4603a8eb478e0f603ad51d9 (diff) | |
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
Diffstat (limited to 'cron-jobs/sourceballs')
| -rwxr-xr-x | cron-jobs/sourceballs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cron-jobs/sourceballs b/cron-jobs/sourceballs index 44492ef..c12a128 100755 --- a/cron-jobs/sourceballs +++ b/cron-jobs/sourceballs @@ -126,7 +126,7 @@ if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old source packages..." "${SOURCE_CLEANUP_DRYRUN}" && warning 'dry run mode is active' for old_pkg in "${old_pkgs[@]}"; do - msg2 "${old_pkg}" + msg2 '%s' "${old_pkg}" if ! "${SOURCE_CLEANUP_DRYRUN}"; then mv_acl "$FTP_BASE/${SRCPOOL}/${old_pkg}" "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}" touch "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}" @@ -138,7 +138,7 @@ old_pkgs=($(find "${SOURCE_CLEANUP_DESTDIR}" -type f -name "*${SRCEXT}" -mtime + if [ ${#old_pkgs[@]} -ge 1 ]; then msg "Removing old source packages from the cleanup directory..." for old_pkg in "${old_pkgs[@]}"; do - msg2 "${old_pkg}" + msg2 '%s' "${old_pkg}" "${SOURCE_CLEANUP_DRYRUN}" || rm -f "${SOURCE_CLEANUP_DESTDIR}/${old_pkg}" done fi |