Changeset 47

Timestamp:

20/11/06 00:00:19 (5 years ago)

Author:

andy

Message:

Fix bug #33 "Backing up homedir to homedir causes infinite loop" and bug #34 "Can't backup broken symlinks"

Location:

trunk/src/pybackpack

Files:

• gui.py (modified) (1 diff)
• rdiff_interface.py (modified) (1 diff)

trunk/src/pybackpack/gui.py

@@ -521 +521 @@
                                 for dirname, dirs, files in os.walk(path):
                                         for file in files:
-                                                buf.insert(buf.get_end_iter(), "   %s" % os.path.join(dirname,file))
-                                                if os.access(os.path.join(dirname,file), os.R_OK):
+                                                fullpath = os.path.join(dirname,file)
+                                                buf.insert(buf.get_end_iter(), "   %s" % fullpath)
+                                                # We might be backing up a broken symlink, but who cares, we're not following them
+                                                if os.path.islink(fullpath):
                                                         filecount += 1
-                                                        buf.insert(buf.get_end_iter(), " [OK]\n")
+                                                        # buf.insert(buf.get_end_iter(), " [OK:SYM]\n")
+                                                elif os.access(fullpath, os.R_OK):
+                                                        filecount += 1
+                                                        # buf.insert(buf.get_end_iter(), " [OK]\n")
                                                 else:
-                                                        problems.append((os.path.join(dirname,file), "File"))
-                                                        buf.insert(buf.get_end_iter(), " [ERR]\n")
+                                                        problems.append((fullpath, "File"))
+                                                        # buf.insert(buf.get_end_iter(), " [ERR]\n")
                                         for dir in dirs:
-                                                if os.access(os.path.join(dirname,dir), os.R_OK|os.X_OK):
+                                                fullpath = os.path.join(dirname,dir)
+                                                if os.access(fullpath, os.R_OK|os.X_OK):
                                                         filecount += 1
                                                 else:
-                                                        problems.append((os.path.join(dirname,dir),"Directory"))
+                                                        problems.append((fullpath,"Directory"))
                         elif os.access(path, os.R_OK):
                                 filecount += 1

trunk/src/pybackpack/rdiff_interface.py

@@ -238 +238 @@
         exitfunction = sys.exit
         sys.exit = SysExit
-        arglist = ['--terminal-verbosity', '5', '--verbosity', '9', '--include-globbing-filelist', setspath+set['path']+"/filelist", "/", dest]
+        arglist = ['--terminal-verbosity', '5', '--verbosity', '9', '--exclude', dest, '--include-globbing-filelist', setspath+set['path']+"/filelist", "/", dest]
         sys.stdout = output
         sys.stderr = err_output