Software Properties

Merge ~nteodosio/software-properties:escape-syntax into software-properties:ubuntu/master

  1. Git
  2. lp:~nteodosio/software-properties
  3. escape-syntax
  4. Merge into ubuntu/master
Proposed by Nathan Teodosio
Status: Merged
Merge reported by: Nick Rosbrook
Merged at revision: eff50f8d99785576f1da49d53e03ca62e89fb603
Proposed branch: ~nteodosio/software-properties:escape-syntax
Merge into: software-properties:ubuntu/master
Diff against target: 13 lines (+1/-1)
1 file modified
softwareproperties/gtk/DialogMirror.py (+1/-1)
Reviewer Review Type Date Requested Status
Calvin Mwadime Makokha (community) Approve
Ubuntu Core Development Team Pending
Review via email: mp+463288@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Calvin Mwadime Makokha (calvinmwadime) wrote :

I was about to up this MP. LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/softwareproperties/gtk/DialogMirror.py b/softwareproperties/gtk/DialogMirror.py
2index c288fe9..e52247c 100644
3--- a/softwareproperties/gtk/DialogMirror.py
4+++ b/softwareproperties/gtk/DialogMirror.py
5@@ -194,7 +194,7 @@ class DialogMirror:
6 ''' Check if a given uri is a vaild one '''
7 if uri == None:
8 return False
9- elif re.match("^((ftp)|(http)|(file)|(rsync)|(https))://([a-z]|[A-Z]|[0-9]|:|/|\.|~)+$", uri) == None:
10+ elif re.match(r"^((ftp)|(http)|(file)|(rsync)|(https))://([a-z]|[A-Z]|[0-9]|:|/|\.|~)+$", uri) == None:
11 return False
12 else:
13 return True

Subscribers

People subscribed via source and target branches