SF.net SVN: safekeep:[597] safekeep/trunk/safekeep

[<di...@us...>]

Revision: 597
          http://safekeep.svn.sourceforge.net/safekeep/?rev=597&view=rev
Author:   dimi
Date:     2008-07-17 19:00:36 +0000 (Thu, 17 Jul 2008)

Log Message:
-----------
Rework a bit the options processing such that generic rdiff-backup options don't affect the behaviour of the 'special-files' option.

Modified Paths:
--------------
    safekeep/trunk/safekeep

Modified: safekeep/trunk/safekeep
===================================================================
--- safekeep/trunk/safekeep	2008-07-17 18:52:09 UTC (rev 596)
+++ safekeep/trunk/safekeep	2008-07-17 19:00:36 UTC (rev 597)
@@ -712,13 +712,12 @@
         args.extend(['--force'])
 
     options_append = []
+    special_files = ['--exclude-special-files', '--include-symbolic-links']
     for option in cfg['options']:
         if 'special-files' in option:
             if 'include' in option['special-files']:
-                if 'true'.startswith(option['special-files']['include'].lower()):
-                    options_append.extend(['--include-special-files'])
-                else:
-                    options_append.extend(['--exclude-special-files', '--include-symbolic-links'])
+                if 'true' == option['special-files']['include'].lower():
+                    special_files = ['--include-special-files']
 
         # Note if we ever add other backends this section should only be run
         # when rback-diff is the current option.
@@ -727,12 +726,9 @@
             if 'append' in option['rdiff-backup']:
                 options_append.extend(option['rdiff-backup']['append'].split(None))
 
-    if options_append:
-        args.extend(options_append)
-    else:
-        args.extend(['--exclude-special-files', '--include-symbolic-links'])
+    args.extend(special_files)
+    args.extend(options_append)
 
-    #args.extend([ '-v', '6'])
     for clude in cfg['cludes']:
         opt = '--' + clude['type']
         if clude['path']:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.