duplicity-team team mailing list archive

[qsantos <qsantos@xxxxxxxxxx>]

qsantos has proposed merging lp:~qsantos/duplicity/fix-unmatched-rule-error into lp:duplicity.

Requested reviews:
  duplicity-team (duplicity-team)

For more details, see:
https://code.launchpad.net/~qsantos/duplicity/fix-unmatched-rule-error/+merge/356227

There are actually two commits: the first fixes a very minor detail in the README regarding the Python version that should be used; the second fixes the way exceptions are handled when an incorrect rule is specified, and display the nice error message rather than an obscure stack trace.
-- 
Your team duplicity-team is requested to review the proposed merge of lp:~qsantos/duplicity/fix-unmatched-rule-error into lp:duplicity.

=== modified file 'README'
--- README	2017-07-11 14:55:38 +0000
+++ README	2018-10-07 12:22:00 +0000
@@ -19,7 +19,7 @@
 
 REQUIREMENTS:
 
- * Python v2.7 or later
+ * Python v2.7
  * librsync v0.9.6 or later
  * GnuPG for encryption
  * fasteners 0.14.1 or later for concurrency locking

=== modified file 'duplicity/selection.py'
--- duplicity/selection.py	2018-07-18 21:21:24 +0000
+++ duplicity/selection.py	2018-10-07 12:22:00 +0000
@@ -43,11 +43,6 @@
 """
 
 
-class SelectError(Exception):
-    u"""Some error dealing with the Select class"""
-    pass
-
-
 class Select:
     u"""Iterate appropriate Paths in given directory
 
@@ -281,7 +276,7 @@
                     self.add_selection_func(self.regexp_get_sf(arg, 1))
                 else:
                     assert 0, u"Bad selection option %s" % opt
-        except SelectError as e:
+        except GlobbingError as e:
             self.parse_catch_error(e)
         assert filelists_index == len(filelists)
         self.parse_last_excludes()
@@ -508,8 +503,7 @@
         file_prefix_selection = select_fn_from_glob(glob_str, include=1)(self.rootpath)
         if not file_prefix_selection:
             # file_prefix_selection == 1 (include) or 2 (scan)
-            raise FilePrefixError(glob_str + u" glob with " + self.rootpath.uc_name
-                                  + u" path gives " + unicode(file_prefix_selection))
+            raise FilePrefixError(glob_str)
 
         return select_fn_from_glob(glob_str, include, ignore_case)