Merge lp:~thomir-deactivatedaccount/python-ubuntu-platform-api/fix-1234956 into lp:python-ubuntu-platform-api

Proposed by Thomi Richards
Status: Merged
Approved by: Thomi Richards
Approved revision: 18
Merged at revision: 18
Proposed branch: lp:~thomir-deactivatedaccount/python-ubuntu-platform-api/fix-1234956
Merge into: lp:python-ubuntu-platform-api
Diff against target: 12 lines (+1/-1)
1 file modified
upa/_mir.cpp (+1/-1)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/python-ubuntu-platform-api/fix-1234956
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Kevin DuBois (community) Approve
Review via email: mp+189193@code.launchpad.net

Commit message

Make the python-upa module return the correct values on a maguro.

Description of the change

Make the python-upa module return the correct values on a maguro.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

lgtm

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'upa/_mir.cpp'
2--- upa/_mir.cpp 2013-10-01 13:05:41 +0000
3+++ upa/_mir.cpp 2013-10-03 23:18:18 +0000
4@@ -31,7 +31,7 @@
5 int32_t res_y = 0;
6 char device[20];
7
8- FILE *fp = popen("/usr/bin/getprop ro.hardware", "r");
9+ FILE *fp = popen("/usr/bin/getprop ro.product.device", "r");
10 if (fp == NULL) {
11 printf("UPAModule: unable to get run shell command");
12 pclose(fp);

Subscribers

People subscribed via source and target branches

to all changes: