Merge lp:~sergiusens/phablet-tools/1245569 into lp:phablet-tools

Proposed by Sergio Schvezov
Status: Merged
Approved by: Sergio Schvezov
Approved revision: 220
Merged at revision: 218
Proposed branch: lp:~sergiusens/phablet-tools/1245569
Merge into: lp:phablet-tools
Diff against target: 26 lines (+3/-2)
2 files modified
phabletutils/arguments.py (+1/-1)
phabletutils/settings.py (+2/-1)
To merge this branch: bzr merge lp:~sergiusens/phablet-tools/1245569
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Andy Doan (community) Approve
Ubuntu Phablet Team Pending
Review via email: mp+192917@code.launchpad.net

Commit message

phablet-flash: Switching default from saucy to trusty for cdimage-touch

To post a comment you must log in.
Revision history for this message
Andy Doan (doanac) wrote :

almost a bit too subtle how you have "series='saucy'" in arguments.py. I wonder if that should be defined as a new value in settings.py like "cdimage_legacy_series"?

review: Approve
Revision history for this message
Sergio Schvezov (sergiusens) wrote :

> almost a bit too subtle how you have "series='saucy'" in arguments.py. I
> wonder if that should be defined as a new value in settings.py like
> "cdimage_legacy_series"?

Addressed in r220

Revision history for this message
Andy Doan (doanac) wrote :

nice thanks

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'phabletutils/arguments.py'
2--- phabletutils/arguments.py 2013-10-15 20:02:19 +0000
3+++ phabletutils/arguments.py 2013-10-28 18:20:43 +0000
4@@ -160,7 +160,7 @@
5 help='Provisions the device with legacy unflipped images.')
6 parser.set_defaults(func=environment.setup_cdimage_legacy,
7 project='ubuntu-touch-preview',
8- series=settings.default_series,
9+ series=settings.cdimage_legacy_series,
10 build=None,
11 uri=None)
12 parser.add_argument('-b',
13
14=== modified file 'phabletutils/settings.py'
15--- phabletutils/settings.py 2013-08-06 22:08:03 +0000
16+++ phabletutils/settings.py 2013-10-28 18:20:43 +0000
17@@ -15,7 +15,8 @@
18 # along with this program. If not, see <http://www.gnu.org/licenses/>.
19
20 revision = 2
21-default_series = 'saucy'
22+default_series = 'trusty'
23+cdimage_legacy_series = 'saucy'
24 cdimage_uri_base = 'http://cdimage.ubuntu.com'
25 system_image_uri = 'https://system-image.ubuntu.com'
26 download_dir = 'phablet-flash'

Subscribers

People subscribed via source and target branches