unity-scopes-api

Merge lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir into lp://staging/unity-scopes-api

  1. non-pre-existing-click-dir
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 222
Merged at revision: 212
Proposed branch: lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir
Merge into: lp://staging/unity-scopes-api
Prerequisite: lp://staging/unity-scopes-api/staging
Diff against target: 404 lines (+227/-55)
5 files modified
scoperegistry/DirWatcher.cpp (+3/-3)
scoperegistry/ScopesWatcher.cpp (+154/-48)
scoperegistry/ScopesWatcher.h (+8/-3)
test/gtest/scopes/Registry/RegistryTest.ini.in (+1/-1)
test/gtest/scopes/Registry/Registry_test.cpp (+61/-0)
To merge this branch: bzr merge lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir
Reviewer Review Type Date Requested Status
Pete Woods (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+222009@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-06-04.

Commit message

Watch parent directories of install directories in order to be notified when entire install directories are added / removed.

Description of the change

Watch parent directories of install directories in order to be notified when entire install directories are added / removed.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:218
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-ci/641/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-amd64-ci/195/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-armhf-ci/193/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-devel-utopic-i386-ci/193/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-devel-ci/641/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir updated
219. By Marcus Tomlinson

Remove catch(...) from ScopesWatcher

220. By Marcus Tomlinson

Handle SyscallException when adding parent watch

221. By Marcus Tomlinson

Catch expected exceptions rather than std::exception

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:219
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/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir/+merge/222009/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/387/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/387/rebuild

review: Needs Fixing (continuous-integration)
lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir updated
222. By Marcus Tomlinson

Renamed "dir_to_ini_map_" to "sdir_to_ini_map_" to match "idir_to_sdirs_map_" naming

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:221
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/388/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-utopic-i386-ci/15

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/388/rebuild

review: Approve (continuous-integration)
Revision history for this message
Pete Woods (pete-woods) :
review: Approve
lp://staging/~unity-api-team/unity-scopes-api/non-pre-existing-click-dir updated
223. By Marcus Tomlinson

Catch ResourceException as well when attempting to add_scope_dir() on newly discovered files.

224. By Marcus Tomlinson

Only add scope directories that fall directly under an install directory

225. By Marcus Tomlinson

Fixed comment

226. By Marcus Tomlinson

Ahh, properly fixed comment now. doh!

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: