Merge lp:~breunigs/duplicity/amazondrive3 into lp:duplicity

Proposed by Stefan Breunig on 2016-12-26
Status: Merged
Approved by: Kenneth Loafman on 2017-04-29
Approved revision: 1155
Merge reported by: Kenneth Loafman
Merged at revision: not available
Proposed branch: lp:~breunigs/duplicity/amazondrive3
Merge into: lp:duplicity
Diff against target: 25 lines (+2/-2)
2 files modified
duplicity/backends/adbackend.py (+1/-1)
duplicity/backends/onedrivebackend.py (+1/-1)
To merge this branch: bzr merge lp:~breunigs/duplicity/amazondrive3
Reviewer Review Type Date Requested Status
duplicity-team 2016-12-26 Pending
Review via email: mp+313872@code.launchpad.net

Description of the change

As reported on the mailinglist, if a space is entered while duplicity asks for the URL, it fails. Since all important spaces are URL encoded anyway, this should be fine even if there are spaces in the URL at all. I also patched it in the onedrive backend, because it must have similar issues.

Cheers
Stefan

To post a comment you must log in.
Kenneth Loafman (kenneth-loafman) wrote :

Another one LP missed. Already merged.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'duplicity/backends/adbackend.py'
2--- duplicity/backends/adbackend.py 2016-11-06 14:02:54 +0000
3+++ duplicity/backends/adbackend.py 2016-12-26 08:07:40 +0000
4@@ -147,7 +147,7 @@
5 print ''
6
7 redirected_to = (raw_input('URL of the resulting page: ')
8- .replace('http://', 'https://', 1))
9+ .replace('http://', 'https://', 1)).strip()
10
11 token = self.http_client.fetch_token(
12 self.OAUTH_TOKEN_URL,
13
14=== modified file 'duplicity/backends/onedrivebackend.py'
15--- duplicity/backends/onedrivebackend.py 2016-06-08 19:06:18 +0000
16+++ duplicity/backends/onedrivebackend.py 2016-12-26 08:07:40 +0000
17@@ -149,7 +149,7 @@
18 'page the dialog leads to.' % authorization_url)
19 print()
20
21- redirected_to = raw_input('URL of the blank page: ')
22+ redirected_to = raw_input('URL of the blank page: ').strip()
23
24 token = self.http_client.fetch_token(
25 self.OAUTH_TOKEN_URI,

Subscribers

People subscribed via source and target branches