lp:~aaron-whitehouse/duplicity/Bug_1624725_files_within_folder_slash

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~duplicity-team/duplicity/0.7-series at revision 1257

duplicity-team: Pending requested 2016-11-20

Diff: 481 lines (+365/-15)

5 files modified

duplicity/globmatch.py (+37/-8)
duplicity/selection.py (+7/-2)
testing/functional/test_selection.py (+76/-1)
testing/unit/test_globmatch.py (+215/-2)
testing/unit/test_selection.py (+30/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1624725: Including a folder ending in "/" does not include folder contents

High

Fix Released

Link a bug report

Related blueprints

1249. By Aaron Whitehouse on 2016-11-20

Merge in changes from trunk.

1248. By Aaron Whitehouse on 2016-11-20

Added tests to ensure behaviour is as expected for expressions containing globs, as these traverse a different code path.

1247. By Aaron Whitehouse on 2016-11-06

Fixed Bug #1624725, so that an include glob ending in "/" now includes folder contents (for globs with and without special characters)

1246. By Aaron Whitehouse on 2016-09-26

* Added inline comment to globmatch.py explaining glob matching.
* Removed trailing / from Path() unittests, as paths used in duplicity do not normally have these, even if they are folders.
* Added unit test to show files within a matched folder are included without a trailing slash.
* Fixed return value of test_slash_star_scans_folder unittest from include to scan.

1245. By Aaron Whitehouse on 2016-09-25

Add unittests and code comments to explain glob processing/regex behaviour.

1244. By Aaron Whitehouse on 2016-09-18

Add more tests for trailing slash behaviour.

1243. By Aaron Whitehouse on 2016-09-17

Added (failing) test to show behaviour in Bug #1624725

1242. By Kenneth Loafman on 2016-09-16

* Fixed bug #1623342 with patch from Daniel Jakots
  - failing test on OpenBSD because tar/gtar not found

1241. By ken on 2016-09-06

* Merged in lp:~aaron-whitehouse/duplicity/bug_1620085_exclude-if-present-locked-folder
  - Fixes Bug #1620085: --exclude-if-present gives OSError looking for tag in locked folders

1240. By Kenneth Loafman on 2016-08-22

* Merged in lp:~mstoll-de/duplicity/duplicity
  - Backblaze announced a new domain for the b2 api