Merge lp:~mardy/ubuntu-system-settings-online-accounts/lp1454210 into lp:ubuntu-system-settings-online-accounts

[Alberto Mardegan]

Make sure that accounts are not removed on app updates

When looking for the original hook files, strip out the version number and instead match solely on the short app ID. This will prevent removing accounts when the old hook files have been removed, but a new version is available.

Make sure that accounts are not removed on app updates

When looking for the original hook files, strip out the version number and instead match solely on the short app ID. This will prevent removing accounts when the old hook files have been removed, but a new version is available.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:272
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mardy/ubuntu-system-settings-online-accounts/lp1454210/+merge/262321/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/120
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/120
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21284

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

review: Needs Fixing (continuous-integration)

[lp:~mardy/ubuntu-system-settings-online-accounts/lp1454210]

273. By Alberto Mardegan on 2015-08-04

from trunk

[ Andreas Pokorny ]
* rebuild for libmirclient9 part of mir release 0.14.0 - removes
  architecture restrictions imposed by previous mir releases.
[ CI Train Bot ]
* Resync trunk. added: po/cy.po
[ Alberto Mardegan ]
* Inject the APP_ID into the child process's environment. (LP:
  #1468792)
[ CI Train Bot ]
* New rebuild forced.
* Resync trunk.
[ Alberto Mardegan ]
* Fix build with Qt 5.5 (LP: #1387537, #1421009, #1448878, #1447175)
* Return the error name to the client (LP: #1441873)
[ CI Train Bot ]
* New rebuild forced.

274. By Alberto Mardegan on 2015-08-04

sync with archive

No-change test rebuild for g++5 ABI transition

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:273
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/482
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/346
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/482
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/482/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22304

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:274
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/228/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-wily-touch/483
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-wily-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-wily-mako/347
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/483
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-wily-armhf/483/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22308

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

review: Approve (continuous-integration)

[David Barth (dbarth)]

review: Approve

=== modified file 'click-hooks/main.cpp'
--- click-hooks/main.cpp	2015-01-22 10:22:56 +0000
+++ click-hooks/main.cpp	2015-08-04 09:05:17 +0000
@@ -257,8 +257,9 @@
             /* Check that the hook file is still there; if it isn't, then it
              * means that the click package was removed, and we must remove our
              * copy as well. */
-            QString hookFileName = profile + "." + fileType;
-            if (hooksDirIn.exists(hookFileName)) continue;
+            QString hookFileName = stripVersion(profile) + "_*." + fileType;
+            QStringList nameFilters = QStringList() << hookFileName;
+            if (!hooksDirIn.entryList(nameFilters).isEmpty()) continue;
 
             QFile::remove(fileInfo.filePath());
             /* If this is a provider, we must also remove any accounts

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-16 18:35:02 +0000
+++ debian/changelog	2015-08-04 09:05:17 +0000
@@ -1,3 +1,9 @@
+ubuntu-system-settings-online-accounts (0.6+15.10.20150716-0ubuntu2~gcc5.1) wily; urgency=medium
+
+  * No-change test rebuild for g++5 ABI transition
+
+ -- Steve Langasek <[e-mail]>  Fri, 17 Jul 2015 22:43:27 +0000
+
 ubuntu-system-settings-online-accounts (0.6+15.10.20150716-0ubuntu1) wily; urgency=medium
 
   [ Andreas Pokorny ]

=== modified file 'tests/click-hooks/tst_online_accounts_hooks.cpp'
--- tests/click-hooks/tst_online_accounts_hooks.cpp	2015-01-22 10:22:56 +0000
+++ tests/click-hooks/tst_online_accounts_hooks.cpp	2015-08-04 09:05:17 +0000
@@ -398,7 +398,9 @@
         "</provider>");
     QVERIFY(m_installDir.exists(stillInstalled));
 
-    writeHookFile("com-ubuntu.test_StillInstalled_2.0.provider",
+    /* Write a newer version of the hook, to make sure that accounts created
+     * with older versions of the app are preserved */
+    writeHookFile("com-ubuntu.test_StillInstalled_3.0.provider",
         "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
         "<provider>\n"
         "</provider>");
@@ -471,6 +473,7 @@
 
     /* Now remove the hook file and write a newer version of it */
     clearHooksDir();
+    QTest::qWait(1500); // make sure that the timestamp is newer
     writeHookFile("com-ubuntu.test_MyApp_1.1.application",
         "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"
         "<application>\n"