[systemd-commits] 2 commits - src/shared test/sysv-generator-test.py

[Martin Pitt]

 src/shared/util.c           |    4 ++++
 test/sysv-generator-test.py |   14 ++++++++++++++
 2 files changed, 18 insertions(+)

New commits:
commit d816e2b7909e50ee887e1a0a825db760cf6fd3b0
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Jan 21 15:30:01 2015 +0100

    systemd-sysv-generator test: test scripts with hidden suffixes
    
    We don't expect any unit generated from temporary package manager, swap, and
    similar files.

diff --git a/test/sysv-generator-test.py b/test/sysv-generator-test.py
index a3daa9f..df13c98 100644
--- a/test/sysv-generator-test.py
+++ b/test/sysv-generator-test.py
@@ -313,6 +313,20 @@ class SysvGeneratorTest(unittest.TestCase):
         self.assertEqual(os.readlink(os.path.join(self.out_dir, 'bar.service')),
                          'foo.service')
 
+    def test_hidden_files(self):
+        '''init.d script with hidden file suffix'''
+
+        script = self.add_sysv('foo', {}, enable=True)
+        # backup files (not enabled in rcN.d/)
+        shutil.copy(script, script + '.dpkg-new')
+        shutil.copy(script, script + '.dpkg-dist')
+        shutil.copy(script, script + '.swp')
+        shutil.copy(script, script + '.rpmsave')
+
+        err, results = self.run_generator()
+        self.assertEqual(list(results), ['foo.service'])
+
+        self.assert_enabled('foo.service', [2, 3, 4, 5])
 
 
 if __name__ == '__main__':

commit c7088e4999f2e5dd33259948c806f4e2706e77ce
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Wed Jan 21 15:26:13 2015 +0100

    util: Add some missing hidden_file() suffixes
    
    dpkg itself also uses *.dpkg-dist, while .dpkg-{bak,backup,remove} are being
    used by dpkg-maintscript-helper.

diff --git a/src/shared/util.c b/src/shared/util.c
index 9392477..3aa952f 100644
--- a/src/shared/util.c
+++ b/src/shared/util.c
@@ -1539,6 +1539,10 @@ _pure_ static bool hidden_file_allow_backup(const char *filename) {
                 endswith(filename, ".dpkg-old") ||
                 endswith(filename, ".dpkg-new") ||
                 endswith(filename, ".dpkg-tmp") ||
+                endswith(filename, ".dpkg-dist") ||
+                endswith(filename, ".dpkg-bak") ||
+                endswith(filename, ".dpkg-backup") ||
+                endswith(filename, ".dpkg-remove") ||
                 endswith(filename, ".swp");
 }