tahoe backup: perform tilde expansion in exclude-from filename (version 2). fixes...

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / scripts / cli.py

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index bb0f4db2d1997b9cfb57c53f86b9fd68a49b6b04..9a2a75dd183385915cebe9d1755c6c046586a833 100644 (file)
--- a/src/allmydata/scripts/cli.py
+++ b/src/allmydata/scripts/cli.py
@@ -307,10 +307,11 @@ class BackupOptions(VDriveOptions):
     def opt_exclude_from(self, filepath):
         """Ignore file matching glob patterns listed in file, one per
         line. The file is assumed to be in the argv encoding."""
+        abs_filepath = argv_to_abspath(filepath)
         try:
-            exclude_file = file(filepath)
+            exclude_file = file(abs_filepath)
         except:
-            raise BackupConfigurationError('Error opening exclude file %r.' % filepath)
+            raise BackupConfigurationError('Error opening exclude file %s.' % quote_output(abs_filepath))
         try:
             for line in exclude_file:
                 self.opt_exclude(line)