ubuntu-system-settings

Merge lp:~seb128/ubuntu-system-settings/get-custom-version into lp:ubuntu-system-settings

  1. get-custom-version
  2. Merge into trunk
Proposed by Sebastien Bacher on 2015-07-13
Status: Merged
Approved by: Ken VanDine on 2015-07-28
Approved revision: 1466
Merged at revision: 1491
Proposed branch: lp:~seb128/ubuntu-system-settings/get-custom-version
Merge into: lp:ubuntu-system-settings
Diff against target: 133 lines (+14/-23)
7 files modified
plugins/about/Version.qml (+2/-2)
plugins/about/storageabout.cpp (+0/-15)
plugins/about/storageabout.h (+0/-6)
plugins/system-update/system_update.cpp (+7/-0)
plugins/system-update/system_update.h (+1/-0)
plugins/system-update/update_manager.h (+3/-0)
tests/plugins/system-update/fakesystemupdate.h (+1/-0)
To merge this branch: bzr merge lp:~seb128/ubuntu-system-settings/get-custom-version
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration 2015-07-13 Approve on 2015-07-30
Ken VanDine 2015-07-13 Approve on 2015-07-28
Review via email: mp+264619@code.launchpad.net

Commit Message

[system-update] get the custom build information from the s-i service

Description of the Change

[system-update] get the custom build information from the s-i service

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~seb128/ubuntu-system-settings/get-custom-version updated on 2015-07-13
1466. By Sebastien Bacher on 2015-07-13

[system-update] get the custom build information from the s-i service

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1466
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2194/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/321
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/55
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/228
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/321
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/321/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21818

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2194/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1466
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2219/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/449
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-amd64-ci/80
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-wily-i386-ci/80
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/326
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/449
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/449/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22152

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2219/rebuild

review: Needs Fixing (continuous-integration)
Ken VanDine (ken-vandine) wrote :

Looks good

review: Approve
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1466
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2227/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3503
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/411
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3500
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3500/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22202

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2227/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:1466
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3523
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/416
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2921
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3520
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3520/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22222

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/2232/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/about/Version.qml'
2--- plugins/about/Version.qml 2014-11-15 11:22:03 +0000
3+++ plugins/about/Version.qml 2015-07-13 18:26:33 +0000
4@@ -93,8 +93,8 @@
5 SingleValueStacked {
6 objectName: "customizationBuildNumberItem"
7 text: i18n.tr("Customization Image part")
8- value: storedInfo.customizationBuildID
9- visible: storedInfo.customizationBuildID
10+ value: UpdateManager.currentCustomBuildNumber
11+ visible: UpdateManager.currentCustomBuildNumber
12 }
13 }
14 }
15
16=== modified file 'plugins/about/storageabout.cpp'
17--- plugins/about/storageabout.cpp 2015-04-07 21:11:21 +0000
18+++ plugins/about/storageabout.cpp 2015-07-13 18:26:33 +0000
19@@ -191,21 +191,6 @@
20 return m_deviceBuildDisplayID;
21 }
22
23-QString StorageAbout::customizationBuildID()
24-{
25- if (m_customizationBuildID.isEmpty() || m_customizationBuildID.isNull())
26- {
27- QFile file("/custom/build_id");
28- if (!file.exists())
29- return "";
30- file.open(QIODevice::ReadOnly | QIODevice::Text);
31- m_customizationBuildID = QString(file.readAll().trimmed());
32- file.close();
33- }
34-
35- return m_customizationBuildID;
36-}
37-
38 QString StorageAbout::ubuntuBuildID()
39 {
40 if (m_ubuntuBuildID.isEmpty() || m_ubuntuBuildID.isNull())
41
42=== modified file 'plugins/about/storageabout.h'
43--- plugins/about/storageabout.h 2015-02-19 02:08:15 +0000
44+++ plugins/about/storageabout.h 2015-07-13 18:26:33 +0000
45@@ -83,10 +83,6 @@
46 READ deviceBuildDisplayID
47 CONSTANT)
48
49- Q_PROPERTY( QString customizationBuildID
50- READ customizationBuildID
51- CONSTANT)
52-
53 Q_PROPERTY( QString ubuntuBuildID
54 READ ubuntuBuildID
55 CONSTANT)
56@@ -102,7 +98,6 @@
57 QString serialNumber();
58 QString vendorString();
59 QString deviceBuildDisplayID();
60- QString customizationBuildID();
61 QString ubuntuBuildID();
62 Q_INVOKABLE QString licenseInfo(const QString &subdir) const;
63 ClickModel::Roles getSortRole();
64@@ -130,7 +125,6 @@
65 QString m_vendorString;
66 QString m_deviceBuildDisplayID;
67 QString m_ubuntuBuildID;
68- QString m_customizationBuildID;
69 ClickModel m_clickModel;
70 ClickFilterProxy m_clickFilterProxy;
71 quint64 m_moviesSize;
72
73=== modified file 'plugins/system-update/system_update.cpp'
74--- plugins/system-update/system_update.cpp 2015-05-15 15:51:09 +0000
75+++ plugins/system-update/system_update.cpp 2015-07-13 18:26:33 +0000
76@@ -165,6 +165,13 @@
77 return m_detailedVersion.value("device", "Unavailable");
78 }
79
80+QString SystemUpdate::currentCustomBuildNumber() {
81+ if (!m_detailedVersion.contains("custom"))
82+ setCurrentDetailedVersion();
83+
84+ return m_detailedVersion.value("custom", "Unavailable");
85+}
86+
87 int SystemUpdate::downloadMode() {
88 if (m_downloadMode != -1)
89 return m_downloadMode;
90
91=== modified file 'plugins/system-update/system_update.h'
92--- plugins/system-update/system_update.h 2015-05-15 15:51:09 +0000
93+++ plugins/system-update/system_update.h 2015-07-13 18:26:33 +0000
94@@ -48,6 +48,7 @@
95 int currentBuildNumber();
96 QString currentUbuntuBuildNumber();
97 QString currentDeviceBuildNumber();
98+ QString currentCustomBuildNumber();
99 QString deviceName();
100
101 void checkForUpdate();
102
103=== modified file 'plugins/system-update/update_manager.h'
104--- plugins/system-update/update_manager.h 2015-05-15 15:51:09 +0000
105+++ plugins/system-update/update_manager.h 2015-07-13 18:26:33 +0000
106@@ -62,6 +62,8 @@
107 NOTIFY versionChanged)
108 Q_PROPERTY(QString currentDeviceBuildNumber READ currentDeviceBuildNumber
109 NOTIFY versionChanged)
110+ Q_PROPERTY(QString currentCustomBuildNumber READ currentCustomBuildNumber
111+ NOTIFY versionChanged)
112 Q_PROPERTY(QString deviceName READ deviceName
113 NOTIFY deviceNameChanged)
114
115@@ -100,6 +102,7 @@
116 QDateTime lastUpdateDate() { return m_systemUpdate.lastUpdateDate(); }
117 QString currentUbuntuBuildNumber() { return m_systemUpdate.currentUbuntuBuildNumber(); }
118 QString currentDeviceBuildNumber() { return m_systemUpdate.currentDeviceBuildNumber(); }
119+ QString currentCustomBuildNumber() { return m_systemUpdate.currentCustomBuildNumber(); }
120 QString deviceName() { return m_systemUpdate.deviceName(); }
121 bool checkTarget() { return m_systemUpdate.checkTarget(); }
122
123
124=== modified file 'tests/plugins/system-update/fakesystemupdate.h'
125--- tests/plugins/system-update/fakesystemupdate.h 2015-05-15 17:05:29 +0000
126+++ tests/plugins/system-update/fakesystemupdate.h 2015-07-13 18:26:33 +0000
127@@ -38,6 +38,7 @@
128 int currentBuildNumber() { return 123;}
129 QString currentUbuntuBuildNumber() { return QString("20140927");}
130 QString currentDeviceBuildNumber() { return QString("20140927");}
131+ QString currentCustomBuildNumber() { return QString("20140927");}
132 QString deviceName() { return QString("mako");}
133 QDateTime lastUpdateDate() { return QDateTime::currentDateTime(); }
134

Subscribers

People subscribed via source and target branches