Commit d5891fda authored by Zbigniew Jędrzejewski-Szmek's avatar Zbigniew Jędrzejewski-Szmek
Browse files

install: treat non-existent directory as empty

When looking for symlinks, it doesn't make sense to error-out if
the directory is missing. The user might delete an empty directory.

This check caused test-unit-file to fail when run before installation.
parent 4a271908
......@@ -524,8 +524,11 @@ static int find_symlinks(
assert(same_name_link);
fd = open(config_path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)
if (fd < 0) {
if (errno == ENOENT)
return 0;
return -errno;
}
/* This takes possession of fd and closes it */
return find_symlinks_fd(name, fd, config_path, config_path, same_name_link);
......
......@@ -40,7 +40,7 @@ int main(int argc, char *argv[]) {
assert(h);
r = unit_file_get_list(UNIT_FILE_SYSTEM, NULL, h);
log_info("%s", strerror(-r));
log_info("unit_file_get_list: %s", strerror(-r));
assert(r >= 0);
HASHMAP_FOREACH(p, h, i)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment