[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff-backup.1 rdiff_bac...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 07/07/18 21:52:12

Modified files:
        .              : CHANGELOG rdiff-backup.1 
        rdiff_backup   : Globals.py Main.py SetConnections.py 

Log message:
        Add --tempfile and --remote-tempfile options.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.233&r2=1.234
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff-backup.1?cvsroot=rdiff-backup&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Globals.py?cvsroot=rdiff-backup&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/SetConnections.py?cvsroot=rdiff-backup&r1=1.15&r2=1.16

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.233
retrieving revision 1.234
diff -u -b -r1.233 -r1.234
--- CHANGELOG   17 Jul 2007 01:53:49 -0000      1.233
+++ CHANGELOG   18 Jul 2007 21:52:11 -0000      1.234
@@ -1,6 +1,11 @@
 New in v1.1.13 (????/??/??)
 ---------------------------
 
+New options: --tempdir and --remote-tempdir. The first one sets the
+directory that rdiff-backup uses for temporary files on the local system.
+The second adds the --tempdir option with the given path when invoking
+rdiff-backup on remote systems. (Andrew Ferguson)
+
 Don't run the extended attributes test if rdiff-backup is run with
 the --no-eas option. Prevents hang in isolated cases. (Andrew Ferguson)
 

Index: rdiff-backup.1
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff-backup.1,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- rdiff-backup.1      13 May 2007 05:43:05 -0000      1.84
+++ rdiff-backup.1      18 Jul 2007 21:52:11 -0000      1.85
@@ -1,4 +1,4 @@
-.TH RDIFF-BACKUP 1 "NOVEMBER 2006" "Version 1.1.6" "User Manuals" \" -*- nroff 
-*-
+.TH RDIFF-BACKUP 1 "JULY 2007" "Version 1.1.13" "User Manuals" \" -*- nroff -*-
 .SH NAME
 rdiff-backup \- local/remote mirror and incremental backup
 .SH SYNOPSIS
@@ -190,7 +190,7 @@
 .B "\-\-exclude-symbolic-links"
 Exclude all symbolic links.
 .TP
-.BI "\-\exclude-if-present " filename
+.BI "\-\-exclude-if-present " filename
 Exclude directories if
 .IR filename
 is present. This option needs to come before any other include or
@@ -361,7 +361,6 @@
 switches, where the time will be given in seconds since the epoch.
 .TP
 .B \-\-override-chars-to-quote 
-.TP
 If the filesystem to which we are backing up is not case-sensitive, automatic 
'quoting' of characters occurs. For example, a file 'Developer.doc' will be 
converted into ';068eveloper.doc'. To override this behavior, you need to 
specify this option.
 .TP
 .B \-\-preserve-numerical-ids
@@ -399,6 +398,11 @@
 .B REMOTE OPERATION
 section for more information.
 .TP
+.BI "\-\-remote-tempdir " path
+Adds the \-\-tempdir option with argument
+.I path
+when invoking remote instances of rdiff-backup.
+.TP
 .BI "\-\-remove-older-than " time_spec
 Remove the incremental backup information in the destination directory
 that has been around longer than the given time.
@@ -460,6 +464,12 @@
 is ignored if you specify a new schema using
 .B \-\-remote-schema.
 .TP
+.BI "\-\-tempdir " path
+Sets the directory that rdiff-backup uses for temporary files to
+the given path. The environment variables TMPDIR, TEMP, and TMP can
+also be used to set the temporary files directory. See the
+documentation of the Python tempfile module for more information.
+.TP
 .BI "\-\-terminal-verbosity " [0-9]
 Select which messages will be displayed to the terminal.  If missing
 the level defaults to the verbosity level.

Index: rdiff_backup/Globals.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Globals.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- rdiff_backup/Globals.py     29 Dec 2006 16:10:15 -0000      1.43
+++ rdiff_backup/Globals.py     18 Jul 2007 21:52:11 -0000      1.44
@@ -226,6 +226,10 @@
 # the original permissions
 symlink_perms = None
 
+# If set, the path that should be used instead of the default Python
+# tempfile.tempdir value on remote connections
+remote_tempdir = None
+
 def get(name):
        """Return the value of something in this module"""
        return globals()[name]

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- rdiff_backup/Main.py        7 Jul 2007 19:58:37 -0000       1.110
+++ rdiff_backup/Main.py        18 Jul 2007 21:52:11 -0000      1.111
@@ -20,7 +20,7 @@
 """Start (and end) here - read arguments, set global settings, etc."""
 
 from __future__ import generators
-import getopt, sys, re, os, cStringIO
+import getopt, sys, re, os, cStringIO, tempfile
 from log import Log, LoggerError, ErrorLog
 import Globals, Time, SetConnections, selection, robust, rpath, \
           manage, backup, connection, restore, FilenameMapping, \
@@ -81,11 +81,11 @@
                  "no-eas", "no-file-statistics", "no-hard-links", 
"null-separator",
                  "override-chars-to-quote=", "parsable-output",
                  "preserve-numerical-ids", "print-statistics",
-                 "remote-cmd=", "remote-schema=",
+                 "remote-cmd=", "remote-schema=", "remote-tempdir=",
                  "remove-older-than=", "restore-as-of=", "restrict=",
                  "restrict-read-only=", "restrict-update-only=", "server",
-                 "ssh-no-compression", "terminal-verbosity=", "test-server",
-                 "user-mapping-file=", "verbosity=", "verify",
+                 "ssh-no-compression", "tempdir=", "terminal-verbosity=",
+                 "test-server", "user-mapping-file=", "verbosity=", "verify",
                  "verify-at-time=", "version"])
        except getopt.error, e:
                commandline_error("Bad commandline options: " + str(e))
@@ -176,6 +176,7 @@
                        restore_timestr, action = arg, "restore-as-of"
                elif opt == "--remote-cmd": remote_cmd = arg
                elif opt == "--remote-schema": remote_schema = arg
+               elif opt == "--remote-tempdir": Globals.remote_tempdir = arg
                elif opt == "--remove-older-than":
                        remove_older_than_string = arg
                        action = "remove-older-than"
@@ -193,6 +194,7 @@
                        Globals.server = 1
                elif opt == "--ssh-no-compression":
                        Globals.set('ssh_compression', None)
+               elif opt == "--tempdir": tempfile.tempdir = arg
                elif opt == "--terminal-verbosity": Log.setterm_verbosity(arg)
                elif opt == "--test-server": action = "test-server"
                elif opt == "--user-mapping-file": user_mapping_filename = arg

Index: rdiff_backup/SetConnections.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/SetConnections.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- rdiff_backup/SetConnections.py      6 Jun 2004 22:20:35 -0000       1.15
+++ rdiff_backup/SetConnections.py      18 Jul 2007 21:52:11 -0000      1.16
@@ -52,6 +52,9 @@
        if remote_schema: __cmd_schema = remote_schema
        elif not Globals.ssh_compression: __cmd_schema = 
__cmd_schema_no_compress
 
+       if Globals.remote_tempdir:
+               __cmd_schema += (" --tempdir=" + Globals.remote_tempdir)
+
        if not arglist: return []
        desc_pairs = map(parse_file_desc, arglist)