Keeper

Merge lp://staging/~charlesk/keeper/remove-click into lp://staging/keeper/devel

  1. remove-click
  2. Merge into devel
Proposed by Charles Kerr
Status: Needs review
Proposed branch: lp://staging/~charlesk/keeper/remove-click
Merge into: lp://staging/keeper/devel
Prerequisite: lp://staging/~unity-api-team/keeper/sf-errors-dbus-interface
Diff against target: 302 lines (+25/-100)
9 files modified
CMakeLists.txt (+1/-5)
debian/control (+0/-4)
src/helper/CMakeLists.txt (+0/-1)
src/service/backup-choices.cpp (+0/-66)
tests/integration/helpers/CMakeLists.txt (+0/-5)
tests/integration/helpers/test-helpers-base.cpp (+12/-10)
tests/unit/manifest/manifest-test.cpp (+4/-3)
tests/unit/storage-framework/create-uploader-test.cpp (+4/-3)
tests/unit/storage-framework/folders-test.cpp (+4/-3)
To merge this branch: bzr merge lp://staging/~charlesk/keeper/remove-click
Reviewer Review Type Date Requested Status
dobey (community) Needs Fixing
Xavi Garcia (community) Approve
unity-api-1-bot continuous-integration Approve
Review via email: mp+314500@code.staging.launchpad.net

Commit message

remove click, glib, properties-cpp dependencies

Description of the change

remove dependencies:
 * click: dropping click support
 * glib - unused except for trivial g_setenv() and g_unsetenv() calls
 * properties-cpp: no longer used

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

FAILED: Continuous integration, rev:140
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/166/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1340/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1347
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1125/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1125/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:140
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/169/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1343/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1350
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1128/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1128/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Not sure why Jenkins is not happy about the branch.
In some builds I don't see a clear reason.

This is what amd64/zesty complains about:
/usr/bin/ld: cannot find -lpthread

Aside from that the branch looks good to me.

Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/170/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1345/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1352
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1130/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1130/console

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

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~charlesk/keeper/remove-click updated
141. By Charles Kerr

remove properties-cpp from dependencies; we don't use it

142. By Charles Kerr

remove glib from dendencies; we don't use it

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/171/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1346/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1353
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1131/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1131/console

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

review: Needs Fixing (continuous-integration)
Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:142
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/172/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1347/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1354
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1132/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1132/console

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

review: Needs Fixing (continuous-integration)
Reply
lp://staging/~charlesk/keeper/remove-click updated
143. By Charles Kerr

finish r140 by removing click from pkg-config invocation

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/173/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1348
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1355
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1133/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1133
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1133/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:143
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/174/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1349
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1356
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1134/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1134/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1134/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1134/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1134/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1134
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1134/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
lp://staging/~charlesk/keeper/remove-click updated
144. By Charles Kerr

remove other unused dependencies

Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

PASSED: Continuous integration, rev:144
https://jenkins.canonical.com/unity-api-1/job/lp-keeper-ci/175/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1350
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1357
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1135/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1135
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1135/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Reply
Revision history for this message
Xavi Garcia (xavi-garcia-mena) wrote :

Good clean up! Looks good to me

review: Approve
Reply
Revision history for this message
dobey (dobey) :
review: Needs Fixing
Reply

Unmerged revisions

144. By Charles Kerr

remove other unused dependencies

143. By Charles Kerr

finish r140 by removing click from pkg-config invocation

142. By Charles Kerr

remove glib from dendencies; we don't use it

141. By Charles Kerr

remove properties-cpp from dependencies; we don't use it

140. By Charles Kerr

remove libclick use

139. By Charles Kerr

remove json-glib dependency

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: