From bc854dc7cd051e1e5a6ebcca8084b07168051c6c Mon Sep 17 00:00:00 2001 From: Zbigniew Jędrzejewski-Szmek Date: Mon, 15 Dec 2014 23:01:05 -0500 Subject: systemctl: refuse to edit runtime dropins when they already exist in /etc The check for existing unit files and dropins is unified. path_join() is updated to not insert duplicate separators. --- src/test/test-path-util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/test/test-path-util.c') diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c index 58b456a291..11aa52aaed 100644 --- a/src/test/test-path-util.c +++ b/src/test/test-path-util.c @@ -176,13 +176,13 @@ static void test_path_join(void) { test_join("/root", "/a/b", "/c", "/root/a/b/c"); test_join("/root", "a/b", "c", "/root/a/b/c"); test_join("/root", "/a/b", "c", "/root/a/b/c"); - test_join("/root", "/", "c", "/root//c"); + test_join("/root", "/", "c", "/root/c"); test_join("/root", "/", NULL, "/root/"); test_join(NULL, "/a/b", "/c", "/a/b/c"); test_join(NULL, "a/b", "c", "a/b/c"); test_join(NULL, "/a/b", "c", "/a/b/c"); - test_join(NULL, "/", "c", "//c"); + test_join(NULL, "/", "c", "/c"); test_join(NULL, "/", NULL, "/"); } -- cgit v1.2.3-54-g00ecf