diff options
| author | intrigeri <intrigeri@boum.org> | 2010-10-12 11:15:47 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-10-12 11:15:47 +0200 |
| commit | 55d9452da51c5695a96d3a6152577fe44e56ffef (patch) | |
| tree | af7998148ed049c7e3845ff0301003732fdf1b61 | |
| parent | 817ffa139b374e5d0a3e6f6ce593c1fb0ddb2665 (diff) | |
| download | backupninja-55d9452da51c5695a96d3a6152577fe44e56ffef.tar.gz backupninja-55d9452da51c5695a96d3a6152577fe44e56ffef.tar.bz2 | |
dup: use --tempdir option rather than TMPDIR environment variable.
Closes Roundup bug #598.
This breaks support of Debian etch.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | handlers/dup.in | 15 |
2 files changed, 10 insertions, 8 deletions
@@ -3,6 +3,9 @@ version 0.9.9 -- UNRELEASED . Do not error out when no job is configured. Thanks to Jordi Mallach <jordi@debian.org> for the patch (Closes: #597684) handler changes + dup: + . Use --tempdir option rather than TMPDIR environment variable. + (Closes Roundup bug #598) postgresql: . Support various pg_dump formats in addition to pg_dumpall. Thanks to Jacob Anawalt <jlanawalt@gmail.com> for the patch. diff --git a/handlers/dup.in b/handlers/dup.in index 5216643..ae93898 100644 --- a/handlers/dup.in +++ b/handlers/dup.in @@ -185,7 +185,6 @@ if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 6 -a "$duplicity_sub" -g fi ### Temporary directory -precmd= if [ -n "$tmpdir" ]; then if [ ! -d "$tmpdir" ]; then info "Temporary directory ($tmpdir) does not exist, creating it." @@ -194,7 +193,7 @@ if [ -n "$tmpdir" ]; then chmod 0700 "$tmpdir" fi info "Using $tmpdir as TMPDIR" - precmd="${precmd}TMPDIR=$tmpdir " + execstr_options="${execstr_options} --tempdir '$tmpdir'" fi ### Archive directory @@ -270,13 +269,13 @@ fi # cleanup if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then - debug "$precmd duplicity cleanup --force $execstr_options $execstr_serverpart" + debug "duplicity cleanup --force $execstr_options $execstr_serverpart" if [ ! $test ]; then export PASSPHRASE=$password export FTP_PASSWORD=$ftp_password output=`nice -n $nicelevel \ su -c \ - "$precmd duplicity cleanup --force $execstr_options $execstr_serverpart 2>&1"` + "duplicity cleanup --force $execstr_options $execstr_serverpart 2>&1"` exit_code=$? if [ $exit_code -eq 0 ]; then debug $output @@ -291,13 +290,13 @@ fi # remove-older-than if [ "$keep" != "yes" ]; then if [ "$duplicity_major" -ge 0 -a "$duplicity_minor" -ge 4 -a "$duplicity_sub" -ge 4 ]; then - debug "$precmd duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart" + debug "duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart" if [ ! $test ]; then export PASSPHRASE=$password export FTP_PASSWORD=$ftp_password output=`nice -n $nicelevel \ su -c \ - "$precmd duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart 2>&1"` + "duplicity remove-older-than $keep --force $execstr_options $execstr_serverpart 2>&1"` exit_code=$? if [ $exit_code -eq 0 ]; then debug $output @@ -311,14 +310,14 @@ if [ "$keep" != "yes" ]; then fi ### Backup command -debug "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart" +debug "duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart" if [ ! $test ]; then outputfile=`maketemp backupout` export PASSPHRASE=$password export FTP_PASSWORD=$ftp_password output=`nice -n $nicelevel \ su -c \ - "$precmd duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart >$outputfile 2>&1"` + "duplicity $execstr_command $execstr_options $execstr_source --exclude '**' / $execstr_serverpart >$outputfile 2>&1"` exit_code=$? debug $output cat $outputfile | (while read output ; do |