ubiquity

Merge lp:~dpniel/ubiquity/ap-fix-MATE into lp:ubiquity

  1. ap-fix-MATE
  2. Merge into trunk
Proposed by Dan Chapman 
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 6313
Merged at revision: 6322
Proposed branch: lp:~dpniel/ubiquity/ap-fix-MATE
Merge into: lp:ubiquity
Diff against target: 12 lines (+1/-1)
1 file modified
autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py (+1/-1)
To merge this branch: bzr merge lp:~dpniel/ubiquity/ap-fix-MATE
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Max Brustkern (community) Approve
Nicholas Skaggs (community) Approve
Review via email: mp+270248@code.launchpad.net

Description of the change

Fixup to remove the '-' from "Ubuntu-MATE" for string comparisons in the english install tests

To post a comment you must log in.
Revision history for this message
Nicholas Skaggs (nskaggs) wrote :

LGTM.

review: Approve
Revision history for this message
Max Brustkern (nuclearbob) wrote :

Also makes sense to me.

review: Approve
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py'
2--- autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py 2014-06-30 13:09:16 +0000
3+++ autopilot/ubiquity_autopilot_tests/configs/english_label_conf.py 2015-09-05 18:03:57 +0000
4@@ -22,7 +22,7 @@
5 for line in f:
6 distro = line[:max(line.find(' '), 0) or None]
7 if distro:
8- if distro == 'Ubuntu-GNOME':
9+ if distro == 'Ubuntu-GNOME' or distro == "Ubuntu-MATE":
10 return str(distro.replace('-', ' '))
11 else:
12 return str(distro)

Subscribers

People subscribed via source and target branches

to status/vote changes: