[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[lintian] 01/01: Allow spaces arround = in service files.



This is an automated email from the git hooks/post-receive script.

broucaries-guest pushed a commit to branch master
in repository lintian.

commit 5422471c28972c75ea086287b61a855427f28498
Author: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
Date:   Mon Mar 3 21:17:02 2014 +0100

    Allow spaces arround = in service files.
    
    Closes:  #739366
    
    Signed-off-by: Bastien ROUCARIÈS <roucaries.bastien+debian@gmail.com>
---
 checks/systemd.pm                                                | 2 +-
 debian/changelog                                                 | 3 +++
 t/tests/systemd-complex-service-file/debian/debian/install       | 1 +
 t/tests/systemd-complex-service-file/debian/debian/test3.service | 5 +++++
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/checks/systemd.pm b/checks/systemd.pm
index 747bae3..9b88e67 100644
--- a/checks/systemd.pm
+++ b/checks/systemd.pm
@@ -226,7 +226,7 @@ sub extract_service_file_values {
             next;
         }
 
-        my ($key, $value) = ($_ =~ m,^(.*)=(.*)$,);
+        my ($key, $value) = ($_ =~ m,^(.*)\s*=\s*(.*)$,);
         if (   $section eq $extract_section
             && $key eq $extract_key) {
             if ($value eq '') {
diff --git a/debian/changelog b/debian/changelog
index a8bd158..2190d6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ lintian (2.5.22) UNRELEASED; urgency=medium
   * checks/symlinks.pm:
     + [BR] Use Lintian::Data for safe symlinks list. Add
       /dev/null to this list.  (Closes: #740339).
+  * checks/systemd.pm:
+    + [BR] Allow spaces arround = in service files.
+      (Closes: #739366).
   * checks/watch-file.{desc,pm}:
     + [BR] Allow debian/upstream-signing-key.asc,
       thanks to Nicolas Boulenguez (Closes: #736711).
diff --git a/t/tests/systemd-complex-service-file/debian/debian/install b/t/tests/systemd-complex-service-file/debian/debian/install
index 5d4e053..f4ca3c8 100644
--- a/t/tests/systemd-complex-service-file/debian/debian/install
+++ b/t/tests/systemd-complex-service-file/debian/debian/install
@@ -1,2 +1,3 @@
 debian/test.service lib/systemd/system/
 debian/test2.service lib/systemd/system/
+debian/test3.service lib/systemd/system/
\ No newline at end of file
diff --git a/t/tests/systemd-complex-service-file/debian/debian/test3.service b/t/tests/systemd-complex-service-file/debian/debian/test3.service
new file mode 100644
index 0000000..5fe96f6
--- /dev/null
+++ b/t/tests/systemd-complex-service-file/debian/debian/test3.service
@@ -0,0 +1,5 @@
+.include /lib/systemd/system/test.service
+
+[Unit]
+After=
+After = syslog.target

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: