# # # patch "app_state.cc" # from [3281ae9a7eb74b1cbfa4585514d735ef99f72406] # to [88da1b9a775ea7933815df732c3a42905b2b9aaf] # # patch "commands.cc" # from [947d224132325a07130878f1842e2c13c4391bee] # to [51c1ada21a497834c5b76fba46561516c88332c4] # ============================================================ --- app_state.cc 3281ae9a7eb74b1cbfa4585514d735ef99f72406 +++ app_state.cc 88da1b9a775ea7933815df732c3a42905b2b9aaf @@ -143,9 +143,8 @@ } void -app_state::set_restriction(path_set const & valid_paths, - vector const & paths, - bool respect_ignore) +app_state::set_restriction(path_set const & valid_paths, + vector const & paths) { // FIXME: this was written before split_path, and only later kludged to // work with it. Could be much tidier if written with knowledge of @@ -160,13 +159,8 @@ split_path sp; p.split(sp); - if (respect_ignore && lua.hook_ignore_file(p)) - { - L(F("'%s' ignored by restricted path set\n") % p); - continue; - } - - N(p == root || valid_paths.find(sp) != valid_paths.end(), + N(lua.hook_ignore_file(p) || + p == root || valid_paths.find(sp) != valid_paths.end(), F("unknown path '%s'\n") % p); L(F("'%s' added to restricted path set\n") % p); @@ -180,13 +174,8 @@ split_path sp; p.split(sp); - if (respect_ignore && lua.hook_ignore_file(p)) - { - L(F("'%s' ignored by excluded path set\n") % p); - continue; - } - - N(p == root || valid_paths.find(sp) != valid_paths.end(), + N(lua.hook_ignore_file(p) || + p == root || valid_paths.find(sp) != valid_paths.end(), F("unknown path '%s'\n") % p); L(F("'%s' added to excluded path set\n") % p); ============================================================ --- commands.cc 947d224132325a07130878f1842e2c13c4391bee +++ commands.cc 51c1ada21a497834c5b76fba46561516c88332c4 @@ -3281,11 +3281,11 @@ L(F("missing files are '%s'") % file_path(*i)); missing_args.push_back(file_path(*i).as_external()); } - app.set_restriction(valid_paths, missing_args, false); + app.set_restriction(valid_paths, missing_args); } else { - app.set_restriction(valid_paths, args, false); + app.set_restriction(valid_paths, args); } restrict_cset(work, included_work, excluded_work, app);