|
 |
803fb7 |
From c59c376b2623330a70ab692844ca00eb58f67576 Mon Sep 17 00:00:00 2001
|
|
|
803fb7 |
From: Martin Pitt <martin.pitt@ubuntu.com>
|
|
|
803fb7 |
Date: Thu, 19 Feb 2015 11:06:24 +0100
|
|
|
803fb7 |
Subject: [PATCH] sysv-generator: fix wrong "Overwriting existing symlink"
|
|
|
803fb7 |
warnings
|
|
|
803fb7 |
|
|
|
803fb7 |
Fix result testing of is_symlink() to ignore negative results, which happen if
|
|
|
803fb7 |
the file name does not exist at all. In this case we do not want a warning and
|
|
|
803fb7 |
unlink the non-existing link.
|
|
|
803fb7 |
|
|
|
803fb7 |
https://bugs.debian.org/778700
|
|
|
803fb7 |
(cherry picked from commit 4e5589836c9e143796c3f3d81e67ab7a9209e2b0)
|
|
|
803fb7 |
|
|
|
803fb7 |
Apparently this was missed for some reason and did not end up in
|
|
|
803fb7 |
stable previously.
|
|
|
803fb7 |
|
|
|
803fb7 |
Cherry-picked from: 4e55898
|
|
|
803fb7 |
Resolves: #1222517
|
|
|
803fb7 |
---
|
|
|
803fb7 |
src/sysv-generator/sysv-generator.c | 2 +-
|
|
|
803fb7 |
test/sysv-generator-test.py | 7 +++++++
|
|
|
803fb7 |
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
803fb7 |
|
|
|
803fb7 |
diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c
|
|
|
803fb7 |
index cfc4a99e4..3c6cb8f10 100644
|
|
|
803fb7 |
--- a/src/sysv-generator/sysv-generator.c
|
|
|
803fb7 |
+++ b/src/sysv-generator/sysv-generator.c
|
|
|
803fb7 |
@@ -166,7 +166,7 @@ static int generate_unit_file(SysvStub *s) {
|
|
|
803fb7 |
/* We might already have a symlink with the same name from a Provides:,
|
|
|
803fb7 |
* or from backup files like /etc/init.d/foo.bak. Real scripts always win,
|
|
|
803fb7 |
* so remove an existing link */
|
|
|
803fb7 |
- if (is_symlink(unit)) {
|
|
|
803fb7 |
+ if (is_symlink(unit) > 0) {
|
|
|
803fb7 |
log_warning("Overwriting existing symlink %s with real service", unit);
|
|
|
803fb7 |
(void) unlink(unit);
|
|
|
803fb7 |
}
|
|
|
803fb7 |
diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
|
|
|
803fb7 |
index 509899e0a..e716d705c 100644
|
|
|
803fb7 |
--- a/test/sysv-generator-test.py
|
|
|
803fb7 |
+++ b/test/sysv-generator-test.py
|
|
|
803fb7 |
@@ -178,6 +178,8 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
803fb7 |
self.assertEqual(s.get('Service', 'ExecStop'),
|
|
|
803fb7 |
'%s stop' % init_script)
|
|
|
803fb7 |
|
|
|
803fb7 |
+ self.assertNotIn('Overwriting', err)
|
|
|
803fb7 |
+
|
|
|
803fb7 |
def test_simple_enabled_all(self):
|
|
|
803fb7 |
'''simple service without dependencies, enabled in all runlevels'''
|
|
|
803fb7 |
|
|
|
803fb7 |
@@ -185,6 +187,7 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
803fb7 |
err, results = self.run_generator()
|
|
|
803fb7 |
self.assertEqual(list(results), ['foo.service'])
|
|
|
803fb7 |
self.assert_enabled('foo.service', [2, 3, 4, 5])
|
|
|
803fb7 |
+ self.assertNotIn('Overwriting', err)
|
|
|
803fb7 |
|
|
|
803fb7 |
def test_simple_enabled_some(self):
|
|
|
803fb7 |
'''simple service without dependencies, enabled in some runlevels'''
|
|
|
803fb7 |
@@ -270,6 +273,7 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
803fb7 |
for f in ['bar.service', 'baz.service']:
|
|
|
803fb7 |
self.assertEqual(os.readlink(os.path.join(self.out_dir, f)),
|
|
|
803fb7 |
'foo.service')
|
|
|
803fb7 |
+ self.assertNotIn('Overwriting', err)
|
|
|
803fb7 |
|
|
|
803fb7 |
def test_same_provides_in_multiple_scripts(self):
|
|
|
803fb7 |
'''multiple init.d scripts provide the same name'''
|
|
|
803fb7 |
@@ -289,6 +293,9 @@ class SysvGeneratorTest(unittest.TestCase):
|
|
|
803fb7 |
self.add_sysv('bar', {'Provides': 'bar'}, enable=True)
|
|
|
803fb7 |
err, results = self.run_generator()
|
|
|
803fb7 |
self.assertEqual(sorted(results), ['bar.service', 'foo.service'])
|
|
|
803fb7 |
+ # we do expect an overwrite here, bar.service should overwrite the
|
|
|
803fb7 |
+ # alias link from foo.service
|
|
|
803fb7 |
+ self.assertIn('Overwriting', err)
|
|
|
803fb7 |
|
|
|
803fb7 |
def test_nonexecutable_script(self):
|
|
|
803fb7 |
'''ignores non-executable init.d script'''
|