Merge lp:~seb128/ubuntu-system-settings/update-build-number into lp:ubuntu-system-settings

[Sebastien Bacher]

update: get the current build number, use it in the os version string

update: get the current build number, use it in the os version string

[lp:~seb128/ubuntu-system-settings/update-build-number]

445. By Sebastien Bacher on 2013-10-10

update: get the current build number, use it in the os version string

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:445
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/462/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/462

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/462/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Hi Seb! I tested the change and it seems to work like a charm on the device. Just one question...

+ if (m_downloadMode != -1)
+ return m_currentBuildNumber;

Not sure if I understand this part? Shouldn't it be if (currentBuildNumber != -1) instead? Or is it related to download mode in some way? I might be wrong!

review: Needs Fixing

[Łukasz Zemczak (sil2100)]

m_currentBuildNumber of course (m_ got eaten).

[Sebastien Bacher (seb128)]

Thanks Łukasz, well spotted, indeed ... I copied another function as a basis and seems like I forgot that one!

[lp:~seb128/ubuntu-system-settings/update-build-number]

446. By Sebastien Bacher on 2013-10-11

rebase on trunk

447. By Sebastien Bacher on 2013-10-11

use the correct variable name

[Sebastien Bacher (seb128)]

ok, rebased on trunk, commit the fix and pushed the update ... should be good to review ;-)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:447
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/469/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-saucy-amd64-ci/469

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-system-settings-ci/469/rebuild

review: Approve (continuous-integration)

[Łukasz Zemczak (sil2100)]

Awesome!

review: Approve

[Sebastien Bacher (seb128)]

did you mean to change the status as well?

=== modified file 'plugins/about/PageComponent.qml'
--- plugins/about/PageComponent.qml	2013-09-12 11:18:44 +0000
+++ plugins/about/PageComponent.qml	2013-10-11 11:57:00 +0000
@@ -24,6 +24,7 @@
 import Ubuntu.Components 0.1
 import Ubuntu.Components.ListItems 0.1 as ListItem
 import Ubuntu.SystemSettings.StorageAbout 1.0
+import Ubuntu.SystemSettings.Update 1.0
 
 ItemPage {
     id: root
@@ -39,6 +40,10 @@
         id: deviceInfos
     }
 
+    UbuntuUpdatePanel {
+        id: updateBackend
+    }
+
     Flickable {
         id: scrollWidget
         anchors.fill: parent
@@ -90,7 +95,8 @@
 
             ListItem.SingleValue {
                 text: i18n.tr("OS")
-                value: "Ubuntu " + deviceInfos.version(DeviceInfo.Os)
+                value: "Ubuntu " + deviceInfos.version(DeviceInfo.Os) +
+                       (updateBackend.currentBuildNumber ? " (r%1)".arg(updateBackend.currentBuildNumber) : "")
             }
 
             ListItem.SingleValue {

=== modified file 'plugins/system-update/update.cpp'
--- plugins/system-update/update.cpp	2013-09-30 10:51:36 +0000
+++ plugins/system-update/update.cpp	2013-10-11 11:57:00 +0000
@@ -36,6 +36,7 @@
     QObject(parent),
     m_infoMessage(""),
     m_downloadMode(-1),
+    m_currentBuildNumber(-1),
     m_systemBusConnection (QDBusConnection::systemBus()),
     m_SystemServiceIface ("com.canonical.SystemImage",
                          "/Service",
@@ -102,6 +103,17 @@
     Q_EMIT infoMessageChanged();
 }
 
+int Update::currentBuildNumber() {
+    if (m_currentBuildNumber != -1)
+        return m_currentBuildNumber;
+
+    QDBusReply<int> reply = m_SystemServiceIface.call("Info");
+    if (reply.isValid())
+        m_currentBuildNumber = reply.value();
+
+    return m_currentBuildNumber;
+}
+
 int Update::DownloadMode() {
     if (m_downloadMode != -1)
         return m_downloadMode;

=== modified file 'plugins/system-update/update.h'
--- plugins/system-update/update.h	2013-09-30 15:02:34 +0000
+++ plugins/system-update/update.h	2013-10-11 11:57:00 +0000
@@ -39,6 +39,9 @@
                 READ DownloadMode
                 WRITE SetDownloadMode
                 NOTIFY downloadModeChanged)
+    Q_PROPERTY( int currentBuildNumber
+                READ currentBuildNumber
+                CONSTANT)
 
 public:
     explicit Update(QObject *parent = 0);
@@ -50,6 +53,7 @@
     void SetInfoMessage(QString);
     int DownloadMode();
     void SetDownloadMode(int);
+    int currentBuildNumber();
 
     Q_INVOKABLE void CheckForUpdate();
     Q_INVOKABLE void DownloadUpdate();
@@ -76,6 +80,7 @@
 private:
     QString m_infoMessage;
     int m_downloadMode;
+    int m_currentBuildNumber;
 
     QDBusConnection m_systemBusConnection;
     QString m_objectPath;