ubiquity

Merge lp:~fourdollars/ubiquity/trunk into lp:ubiquity

  1. trunk
  2. Merge into trunk
Proposed by Shih-Yuan Lee
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: no longer in the source branch.
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~fourdollars/ubiquity/trunk
Merge into: lp:ubiquity
Diff against target: 15 lines (+3/-2)
1 file modified
ubiquity/plugins/ubi-timezone.py (+3/-2)
To merge this branch: bzr merge lp:~fourdollars/ubiquity/trunk
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+298207@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Looks fine.

review: Approve
lp:~fourdollars/ubiquity/trunk updated
6453. By Mathieu Trudel-Lapierre

Some places doesn't have the location information. (LP: #1584417)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubiquity/plugins/ubi-timezone.py'
2--- ubiquity/plugins/ubi-timezone.py 2014-06-30 13:09:16 +0000
3+++ ubiquity/plugins/ubi-timezone.py 2016-06-23 09:35:21 +0000
4@@ -142,8 +142,9 @@
5 # United States (New York) (United States)
6 # Might want to match the debconf format.
7 name, loc = result
8- model.append([name, '', loc.human_country,
9- str(loc.latitude), str(loc.longitude)])
10+ if loc:
11+ model.append([name, '', loc.human_country,
12+ str(loc.latitude), str(loc.longitude)])
13
14 def geoname_timeout(self, user_data):
15 text, model = user_data

Subscribers

People subscribed via source and target branches

to status/vote changes: