Merge lp:~laney/apturl/1726327 into lp:apturl

Proposed by Iain Lane on 2017-10-23
Status: Merged
Approved by: Sebastien Bacher on 2017-10-23
Approved revision: 150
Merged at revision: 150
Proposed branch: lp:~laney/apturl/1726327
Merge into: lp:apturl
Diff against target: 30 lines (+9/-2)
2 files modified
AptUrl/Parser.py (+2/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~laney/apturl/1726327
Reviewer Review Type Date Requested Status
Sebastien Bacher 2017-10-23 Approve on 2017-10-23
Review via email: mp+332625@code.launchpad.net
To post a comment you must log in.
Iain Lane (laney) wrote :

see the bug, I think it's because a trailing slash is being added

Sebastien Bacher (seb128) wrote :

that seems to address bug #1453576 as well

Sebastien Bacher (seb128) wrote :

change looks good to me

review: Approve
Will Cooke (willcooke) wrote :

Tested with xdg-open on Arful, and it has the desired effect.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AptUrl/Parser.py'
--- AptUrl/Parser.py 2012-06-12 17:00:15 +0000
+++ AptUrl/Parser.py 2017-10-23 11:28:39 +0000
@@ -127,9 +127,9 @@
127 apt_url.repo_url = schema[len("apt+"):] + ":" + package.split("?",1)[0]127 apt_url.repo_url = schema[len("apt+"):] + ":" + package.split("?",1)[0]
128 else:128 else:
129 if "?" in package:129 if "?" in package:
130 apt_url.package = package.split("?")[0].lstrip("/")130 apt_url.package = package.split("?")[0].lstrip("/").rstrip("/")
131 else:131 else:
132 apt_url.package = package.lstrip("/")132 apt_url.package = package.lstrip("/").rstrip("/")
133133
134 # now parse the ?... bits134 # now parse the ?... bits
135 if "?" in package:135 if "?" in package:
136136
=== modified file 'debian/changelog'
--- debian/changelog 2015-12-16 10:23:15 +0000
+++ debian/changelog 2017-10-23 11:28:39 +0000
@@ -1,3 +1,10 @@
1apturl (0.5.2ubuntu11) UNRELEASED; urgency=medium
2
3 * AptUrl/parser.py: Strip trailing slashes that are added by xdg-open/gio
4 and which make package names invalid. (LP: #1726327)
5
6 -- Iain Lane <iain@orangesquash.org.uk> Mon, 23 Oct 2017 12:27:21 +0100
7
1apturl (0.5.2ubuntu10) xenial; urgency=medium8apturl (0.5.2ubuntu10) xenial; urgency=medium
29
3 * debian/apturl.install:10 * debian/apturl.install:

Subscribers

People subscribed via source and target branches