[Merge] lp:~jamesodhunt/libnih/bug-776532 into lp:~upstart-devel/libnih/nih

[Steve Langasek]

Review: Disapprove

The test suite correctly identifies a bug in this proposed branch.  The right fix is for *nih_watch_add* to pass the wrapper *to* nih_dir_walk_scan(); nih_dir_walk_scan() should itself not be wrapping anything or assuming anything about the structure of data, which is what's happening here and causing the test suite failure.

I've got a local fix for this which I'll submit as a separate MP shortly.
-- 
https://code.launchpad.net/~jamesodhunt/libnih/bug-776532/+merge/140150
Your team Upstart Reviewers is subscribed to branch lp:~upstart-devel/libnih/nih.