upstart

Merge lp://staging/~jamesodhunt/upstart/bug-1221466+1222702 into lp://staging/upstart

bug-1221466+1222702
Merge into trunk

Proposed by James Hunt on 2013-09-10

Status:

Merged

Merged at revision:

1549

Proposed branch:

lp://staging/~jamesodhunt/upstart/bug-1221466+1222702

Merge into:

lp://staging/upstart

Diff against target:

327 lines (+191/-43)

3 files modified

ChangeLog (+13/-0)
extra/upstart-file-bridge.c (+32/-8)
scripts/tests/test_pyupstart_session_init.py (+146/-35)

To merge this branch:

bzr merge lp://staging/~jamesodhunt/upstart/bug-1221466+1222702

Related bugs:

Bug #1221466: upstart-file-bridge 'EVENT=create' not working for directories	Medium	Fix Released
Bug #1222702: upstart-file-bridge assert failure: upstart-file-bridge.c:1162: Assertion failed in delete_handler: strstr (path, dir->path) == path	Medium	Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Dimitri John Ledkov (community)		2013-09-10	Approve on 2013-11-03
Review via email: mp+184829@code.staging.launchpad.net

Description of the change

* extra/upstart-file-bridge.c:
  - create_handler(): Use original_file() for directories
    (LP: #1221466, #1222702).
  - watched_dir_new(): Additional assert.
  - watched_file_new():
    - Additional assert.
    - Store original directory path in file object to ensure reliable
      matching for directories.
* scripts/tests/test_pyupstart_session_init.py: Added file bridge tests
  for directory creation, modification and deletion.