deja-dup-team team mailing list archive

[Michael Vogt <michael.vogt@xxxxxxxxxx>]

Michael Vogt has proposed merging lp:~mvo/deja-dup/symlink-fix-lp486662 into lp:deja-dup.

Requested reviews:
  Déjà Dup Maintainers (deja-dup-team)

-- 
https://code.launchpad.net/~mvo/deja-dup/symlink-fix-lp486662/+merge/26271
Your team Déjà Dup Maintainers is requested to review the proposed merge of lp:~mvo/deja-dup/symlink-fix-lp486662 into lp:deja-dup.

=== added directory '.bzr-builddeb'
=== modified file 'common/OperationBackup.vala'
--- common/OperationBackup.vala	2010-01-24 14:21:43 +0000
+++ common/OperationBackup.vala	2010-05-28 07:23:24 +0000
@@ -59,9 +59,18 @@
     
     foreach (File s in exclude_list)
       dup.excludes.prepend(s);
-    foreach (File s in include_list)
-      dup.includes.prepend(s);
-    
+    foreach (File s in include_list) {
+      FileInfo finfo = s.query_info("standard::*", 
+                                    GLib.FileQueryInfoFlags.NOFOLLOW_SYMLINKS, 
+                                    null);
+      if (finfo.get_is_symlink()) {
+        string symlink_target = finfo.get_symlink_target();
+        File parent_dir = s.get_parent();
+        dup.includes.prepend(parent_dir.resolve_relative_path(symlink_target));
+      } else {
+        dup.includes.prepend(s);
+      }
+    }
     dup.local = File.new_for_path("/");
     
     return rv;