Storage Framework

Merge lp:~michihenning/storage-framework/tidy-up into lp:storage-framework/devel

  1. tidy-up
  2. Merge into devel
Proposed by Michi Henning
Status: Merged
Approved by: James Henstridge
Approved revision: 60
Merged at revision: 63
Proposed branch: lp:~michihenning/storage-framework/tidy-up
Merge into: lp:storage-framework/devel
Diff against target: 106 lines (+7/-4)
8 files modified
include/unity/storage/internal/TraceMessageHandler.h (+1/-0)
include/unity/storage/provider/internal/AccountData.h (+1/-0)
include/unity/storage/provider/internal/DBusPeerCache.h (+1/-0)
include/unity/storage/provider/internal/PendingJobs.h (+1/-0)
include/unity/storage/provider/internal/TestServerImpl.h (+1/-0)
include/unity/storage/provider/internal/UploadJobImpl.h (+1/-0)
include/unity/storage/provider/internal/dbusmarshal.h (+1/-0)
src/qt/client/internal/local_client/UploaderImpl.cpp (+0/-4)
To merge this branch: bzr merge lp:~michihenning/storage-framework/tidy-up
Reviewer Review Type Date Requested Status
James Henstridge Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+303899@code.launchpad.net

Commit message

Removed stale debug trace. Suppressed more compile warnings from system headers that caused a lot of noise in the arm builds.

Description of the change

Removed stale debug trace. Suppressed more compile warnings from system headers that caused a lot of noise in the arm builds.

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:60
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/96/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/483
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/489
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=vivid+overlay/394
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=xenial+overlay/394
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-1-sourcepkg/release=yakkety/394
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/324/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/324
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/324/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/96/rebuild

review: Approve (continuous-integration)
Revision history for this message
James Henstridge (jamesh) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/storage/internal/TraceMessageHandler.h'
2--- include/unity/storage/internal/TraceMessageHandler.h 2016-08-12 06:19:22 +0000
3+++ include/unity/storage/internal/TraceMessageHandler.h 2016-08-25 05:21:56 +0000
4@@ -19,6 +19,7 @@
5 #pragma once
6
7 #pragma GCC diagnostic push
8+#pragma GCC diagnostic ignored "-Wcast-align"
9 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
10 #pragma GCC diagnostic ignored "-Wswitch-default"
11 #include <QDebug>
12
13=== modified file 'include/unity/storage/provider/internal/AccountData.h'
14--- include/unity/storage/provider/internal/AccountData.h 2016-08-03 03:55:20 +0000
15+++ include/unity/storage/provider/internal/AccountData.h 2016-08-25 05:21:56 +0000
16@@ -21,6 +21,7 @@
17 #include <unity/storage/provider/Credentials.h>
18
19 #pragma GCC diagnostic push
20+#pragma GCC diagnostic ignored "-Wcast-align"
21 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
22 #pragma GCC diagnostic ignored "-Wswitch-default"
23 #include <OnlineAccounts/Account>
24
25=== modified file 'include/unity/storage/provider/internal/DBusPeerCache.h'
26--- include/unity/storage/provider/internal/DBusPeerCache.h 2016-08-03 03:55:20 +0000
27+++ include/unity/storage/provider/internal/DBusPeerCache.h 2016-08-25 05:21:56 +0000
28@@ -21,6 +21,7 @@
29
30 #include <boost/thread/future.hpp>
31 #pragma GCC diagnostic push
32+#pragma GCC diagnostic ignored "-Wcast-align"
33 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
34 #pragma GCC diagnostic ignored "-Wswitch-default"
35 #include <QDBusConnection>
36
37=== modified file 'include/unity/storage/provider/internal/PendingJobs.h'
38--- include/unity/storage/provider/internal/PendingJobs.h 2016-08-03 03:55:20 +0000
39+++ include/unity/storage/provider/internal/PendingJobs.h 2016-08-25 05:21:56 +0000
40@@ -19,6 +19,7 @@
41 #pragma once
42
43 #pragma GCC diagnostic push
44+#pragma GCC diagnostic ignored "-Wcast-align"
45 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
46 #pragma GCC diagnostic ignored "-Wswitch-default"
47 #include <QDBusConnection>
48
49=== modified file 'include/unity/storage/provider/internal/TestServerImpl.h'
50--- include/unity/storage/provider/internal/TestServerImpl.h 2016-08-11 04:29:36 +0000
51+++ include/unity/storage/provider/internal/TestServerImpl.h 2016-08-25 05:21:56 +0000
52@@ -21,6 +21,7 @@
53 #include <unity/storage/provider/testing/TestServer.h>
54
55 #pragma GCC diagnostic push
56+#pragma GCC diagnostic ignored "-Wcast-align"
57 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
58 #include <QDBusConnection>
59 #pragma GCC diagnostic pop
60
61=== modified file 'include/unity/storage/provider/internal/UploadJobImpl.h'
62--- include/unity/storage/provider/internal/UploadJobImpl.h 2016-08-03 03:55:20 +0000
63+++ include/unity/storage/provider/internal/UploadJobImpl.h 2016-08-25 05:21:56 +0000
64@@ -22,6 +22,7 @@
65
66 #include <boost/thread/future.hpp>
67 #pragma GCC diagnostic push
68+#pragma GCC diagnostic ignored "-Wcast-align"
69 #pragma GCC diagnostic ignored "-Wswitch-default"
70 #include <QObject>
71 #pragma GCC diagnostic pop
72
73=== modified file 'include/unity/storage/provider/internal/dbusmarshal.h'
74--- include/unity/storage/provider/internal/dbusmarshal.h 2016-08-23 23:49:55 +0000
75+++ include/unity/storage/provider/internal/dbusmarshal.h 2016-08-25 05:21:56 +0000
76@@ -21,6 +21,7 @@
77 #include <unity/storage/provider/ProviderBase.h>
78
79 #pragma GCC diagnostic push
80+#pragma GCC diagnostic ignored "-Wcast-align"
81 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
82 #include <QDBusArgument>
83 #include <QVariant>
84
85=== modified file 'src/qt/client/internal/local_client/UploaderImpl.cpp'
86--- src/qt/client/internal/local_client/UploaderImpl.cpp 2016-08-18 09:25:51 +0000
87+++ src/qt/client/internal/local_client/UploaderImpl.cpp 2016-08-25 05:21:56 +0000
88@@ -388,9 +388,7 @@
89
90 upload_thread_->start();
91
92- qDebug() << "waiting for worker thread to initialize";
93 worker_initialized.waitForFinished();
94- qDebug() << "worker thread ready";
95 }
96
97 UploaderImpl::~UploaderImpl()
98@@ -398,9 +396,7 @@
99 if (upload_thread_->isRunning())
100 {
101 Q_EMIT do_cancel();
102- qDebug() << "joining with worker thread";
103 upload_thread_->wait();
104- qDebug() << "join complete";
105 }
106 }
107

Subscribers

People subscribed via source and target branches

to all changes: