rdelaage
/
restic
mirror of https://github.com/restic/restic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1613 from restic/strip-space-files-from 

Strip spaces from items read via --files-from
This commit is contained in:
Alexander Neumann 2018-02-11 21:35:23 +01:00
parent 54c0794cf3 cff3f3dc0d
commit 2debb5c0e0
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
changelog/0.8.2/issue-1590 Normal file
View File

@ -0,0 +1,7 @@
Bugfix: Strip spaces for lines read via --files-from
Leading and trailing spaces in lines read via `--files-from` are now stripped,
so it behaves the same as with lines read via `--exclude-file`.
https://github.com/restic/restic/issues/1590
https://github.com/restic/restic/pull/1613

2
cmd/restic/cmd_backup.go
View File

@ -304,7 +304,7 @@ func readLinesFromFile(filename string) ([]string, error) {
scanner := bufio.NewScanner(r)
for scanner.Scan() {
line := scanner.Text()
line := strings.TrimSpace(scanner.Text())
// ignore empty lines
if line == "" {
continue