Re: [rdiff-backup-users] Problem after upgrading to 0.12.0

[Ben Escoto]

>>>>> "TA" == Troels Arvin <address@hidden>
>>>>> wrote the following on 02 Jul 2003 11:23:18 +0200

  TA> Hello again, On Tue, 2003-07-01 at 22:44, Ben Escoto wrote:
  >> Either way, you can always just hardcode the '79' into that
  >> patch, and forget the 'errno.XXX' stuff.

  TA> The patch didn't cure the problems, though:

I'm not sure from your error message why the patch didn't work, but I
decided to add a --no-change-dir-inc-perms switch, which should also
fix this problem.  Someone earlier (Andrew Bressen?) was bugged by how
empty files were getting suid permissions, so this should fix that
problem also.


-- 
Ben Escoto

Index: Globals.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/Globals.py,v
retrieving revision 1.20
diff -u -r1.20 Globals.py
--- Globals.py  6 Apr 2003 02:56:34 -0000       1.20
+++ Globals.py  16 Jul 2003 05:40:03 -0000
@@ -183,6 +183,11 @@
 # guarantee that any changes have been committed to disk.
 fsync_directories = 1
 
+# If set, directory increments are given the same permissions as the
+# directories they represent.  Otherwise they have the default
+# permissions.
+change_dir_inc_perms = 1
+
 
 def get(name):
        """Return the value of something in this module"""
Index: Main.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.38
diff -u -r1.38 Main.py
--- Main.py     26 Jun 2003 07:23:04 -0000      1.38
+++ Main.py     16 Jul 2003 05:40:03 -0000
@@ -52,15 +52,15 @@
                  "include=", "include-filelist=", "include-filelist-stdin",
                  "include-globbing-filelist=", "include-regexp=",
                  "list-at-time=", "list-changed-since=", "list-increments",
-                 "no-compare-inode", "no-compression",
-                 "no-compression-regexp=", "no-file-statistics",
-                 "no-hard-links", "null-separator", "parsable-output",
-                 "print-statistics", "quoting-char=", "remote-cmd=",
-                 "remote-schema=", "remove-older-than=", "restore-as-of=",
-                 "restrict=", "restrict-read-only=", "restrict-update-only=",
-                 "server", "ssh-no-compression", "terminal-verbosity=",
-                 "test-server", "verbosity=", "version", "windows-mode",
-                 "windows-restore"])
+                 "no-change-dir-inc-perms", "no-compare-inode",
+                 "no-compression", "no-compression-regexp=",
+                 "no-file-statistics", "no-hard-links", "null-separator",
+                 "parsable-output", "print-statistics", "quoting-char=",
+                 "remote-cmd=", "remote-schema=", "remove-older-than=",
+                 "restore-as-of=", "restrict=", "restrict-read-only=",
+                 "restrict-update-only=", "server", "ssh-no-compression",
+                 "terminal-verbosity=", "test-server", "verbosity=",
+                 "version", "windows-mode", "windows-restore"])
        except getopt.error, e:
                commandline_error("Bad commandline options: %s" % str(e))
 
@@ -105,6 +105,8 @@
                        restore_timestr, action = arg, "list-changed-since"
                elif opt == "-l" or opt == "--list-increments":
                        action = "list-increments"
+               elif opt == "--no-change-dir-inc-perms":
+                       Globals.set("change_dir_inc_perms", 0)
                elif opt == "--no-compare-inode": Globals.set("compare_inode", 
0)
                elif opt == "--no-compression": Globals.set("compression", None)
                elif opt == "--no-compression-regexp":
Index: increment.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/increment.py,v
retrieving revision 1.28
diff -u -r1.28 increment.py
--- increment.py        5 Mar 2003 00:22:20 -0000       1.28
+++ increment.py        16 Jul 2003 05:40:03 -0000
@@ -87,7 +87,7 @@
        """Make file indicating directory mirrordir has changed"""
        dirsign = get_inc(incpref, "dir")
        dirsign.touch()
-       rpath.copy_attribs(mirrordir, dirsign)  
+       if Globals.change_dir_inc_perms: rpath.copy_attribs(mirrordir, dirsign) 
        return dirsign
 
 def get_inc(rp, typestr, time = None):

pgpOprquq9DHU.pgp
Description: PGP signature