Merge lp:~larryprice/libertine/package-version-while-installing into lp:libertine

[Larry Price]

Show candidate package version when installed version unavailable.

Show candidate package version when installed version unavailable.

[lp:~larryprice/libertine/package-version-while-installing]

238. By Larry Price on 2016-06-07

constants instead of enum

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:237
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/248/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/251
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/210
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/210
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/210
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/210
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1146/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/248/rebuild

review: Approve (continuous-integration)

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:238
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/249/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/generic-ci-generate-dsc/252
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/211
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=amd64,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/211
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=vivid,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/211
    SUCCESS: https://jenkins.canonical.com/libertine/job/libertine-ci-build-and-test-dsc/architecture=i386,distribution=xenial,label_exp=jenkins-slave-0%20%7C%7C%20jenkins-slave-2/211
    None: https://jenkins.canonical.com/libertine/job/libertine-ci-update-mp/1147/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/libertine-ci-verify-mp/249/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Looks good, thanks!

review: Approve

=== modified file 'libertine/ContainerConfigList.cpp'
--- libertine/ContainerConfigList.cpp	2016-04-22 14:41:08 +0000
+++ libertine/ContainerConfigList.cpp	2016-06-07 18:45:44 +0000
@@ -39,6 +39,13 @@
 
 #include <sys/file.h>
 
+namespace
+{
+static constexpr auto POLICY_INSTALLED_VERSION_LINE = 1;
+static constexpr auto POLICY_CANDIDATE_VERSION_LINE = 2;
+
+}
+
 
 const QString ContainerConfigList::Json_container_list = "containerList";
 const QString ContainerConfigList::Json_default_container = "defaultContainer";
@@ -182,7 +189,7 @@
 
 
 QString ContainerConfigList::
-getAppVersion(QString const& app_info)
+getAppVersion(QString const& app_info, bool installed)
 {
   if (app_info.startsWith("N:") || app_info.isEmpty())
   {
@@ -191,9 +198,10 @@
   else
   {
     QStringList info = app_info.split('\n');
-    return info.at(1).section(": ", 1, 1);
+    return info.at(installed ? POLICY_INSTALLED_VERSION_LINE : POLICY_CANDIDATE_VERSION_LINE)
+               .section(": ", 1, 1);
   }
-} 
+}
 
 
 bool ContainerConfigList::

=== modified file 'libertine/ContainerConfigList.h'
--- libertine/ContainerConfigList.h	2016-04-08 20:16:41 +0000
+++ libertine/ContainerConfigList.h	2016-06-07 18:45:44 +0000
@@ -111,7 +111,7 @@
                QString const& package_name);
 
   Q_INVOKABLE QString
-  getAppVersion(QString const& app_info);
+  getAppVersion(QString const& app_info, bool installed);
 
   Q_INVOKABLE bool
   isValidDebianPackage(QString const& package_string);

=== modified file 'libertine/qml/PackageInfoView.qml'
--- libertine/qml/PackageInfoView.qml	2016-05-19 17:56:43 +0000
+++ libertine/qml/PackageInfoView.qml	2016-06-07 18:45:44 +0000
@@ -96,8 +96,7 @@
     Component.onCompleted: {
         containerConfigList.configChanged.connect(reloadStatus)
         var command = "apt-cache policy " + currentPackage
-        var comp = Qt.createComponent("ContainerManager.qml")
-        worker = comp.createObject(mainView)
+        var worker = Qt.createComponent("ContainerManager.qml").createObject(mainView)
         worker.finishedCommand.connect(getPackageVersion)
 
         packageOperationDetails = mainView.getPackageOperationDetails(currentContainer, currentPackage)
@@ -133,7 +132,7 @@
     }
 
     function getPackageVersion(command_output) {
-        packageVersionText = containerConfigList.getAppVersion(command_output)
+        packageVersionText = containerConfigList.getAppVersion(command_output, statusText === "installed")
     }
 
     function onError() {