opendev/puppet-tmpreaper
Code Issues Proposed changes

Clean up bashate failures

Browse Source 
Fix all of the bashate failures.  Also, bashate will install its negative
tests in its virtualenv, so we need to generate a list of files to pass to
bashate that excludes .tox/

Change-Id: I55559bf6137f705aec9a7f277928ad8d4cadc2ca
This commit is contained in:
K Jonathan Harker 2014-09-03 19:06:12 -07:00
parent 7a7633d6f6
commit 0f852938df
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
files/tmpreaper.sh
View File

@ -41,10 +41,10 @@ if grep '^TMPTIME=' /etc/default/rcS >/dev/null 2>&1; then
# Don't clean files if TMPTIME is negative or 'infinite' # Don't clean files if TMPTIME is negative or 'infinite'
# to mimic the way /lib/init/bootclean.sh works. # to mimic the way /lib/init/bootclean.sh works.
case "$TMPTIME" in case "$TMPTIME" in
-*|infinite|infinity) -*|infinite|infinity)
# don't use this as default # don't use this as default
;; ;;
*) *)
if [ "$TMPTIME" -gt 0 ]; then if [ "$TMPTIME" -gt 0 ]; then
TMPREAPER_TIME=${TMPTIME}d TMPREAPER_TIME=${TMPTIME}d
else else
@ -96,14 +96,14 @@ TMPREAPER_PROTECT_EXTRA=${TMPREAPER_PROTECT_EXTRA:-''}
TMPREAPER_DIRS=${TMPREAPER_DIRS:-'/tmp/.'} TMPREAPER_DIRS=${TMPREAPER_DIRS:-'/tmp/.'}
nice -n10 tmpreaper --delay=$TMPREAPER_DELAY --mtime-dir --symlinks $TMPREAPER_TIME \ nice -n10 tmpreaper --delay=$TMPREAPER_DELAY --mtime-dir --symlinks $TMPREAPER_TIME \
$TMPREAPER_ADDITIONALOPTIONS \ $TMPREAPER_ADDITIONALOPTIONS \
--ctime \ --ctime \
--protect '/tmp/.X*-{lock,unix,unix/*}' \ --protect '/tmp/.X*-{lock,unix,unix/*}' \
--protect '/tmp/.ICE-{unix,unix/*}' \ --protect '/tmp/.ICE-{unix,unix/*}' \
--protect '/tmp/.iroha_{unix,unix/*}' \ --protect '/tmp/.iroha_{unix,unix/*}' \
--protect '/tmp/.ki2-{unix,unix/*}' \ --protect '/tmp/.ki2-{unix,unix/*}' \
--protect '/tmp/lost+found' \ --protect '/tmp/lost+found' \
--protect '/tmp/journal.dat' \ --protect '/tmp/journal.dat' \
--protect '/tmp/quota.{user,group}' \ --protect '/tmp/quota.{user,group}' \
`for i in $TMPREAPER_PROTECT_EXTRA; do echo --protect "$i"; done` \ `for i in $TMPREAPER_PROTECT_EXTRA; do echo --protect "$i"; done` \
$TMPREAPER_DIRS $TMPREAPER_DIRS