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

[SCM] Debian package checker branch, master, updated. 2.5.14-81-gb417129



The following commit has been merged in the master branch:
commit b417129d5b3767b7b8678fec8a4fe22ca65ba752
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Jul 22 12:22:32 2013 +0200

    t: Move #DEBHELPER# token in a test
    
    This makes the test immune to changes to the "default" snippets
    inserted by debhelper.  Notably, debhelper in Wheezy and Jessie
    produces a different output, which would cause the test to fail
    when run in Wheezy.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/t/tests/systemd-general/debian/debian/postrm b/t/tests/systemd-general/debian/debian/postrm
index c4a5ba4..6e5813a 100644
--- a/t/tests/systemd-general/debian/debian/postrm
+++ b/t/tests/systemd-general/debian/debian/postrm
@@ -2,8 +2,9 @@
 
 set -e
 
-#DEBHELPER#
-
 if [ "$1" = "purge" ] && which systemctl >/dev/null 2>&1; then
     systemctl || true
 fi
+
+#DEBHELPER#
+
diff --git a/t/tests/systemd-general/tags b/t/tests/systemd-general/tags
index a877201..5f1f76f 100644
--- a/t/tests/systemd-general/tags
+++ b/t/tests/systemd-general/tags
@@ -9,6 +9,6 @@ E: systemd-general: systemd-service-file-outside-lib etc/systemd/system/test.ser
 E: systemd-general: systemd-tmpfiles.d-outside-usr-lib etc/tmpfiles.d/test.conf
 W: systemd-general: init.d-script-call-internal-API etc/init.d/systemd-general
 W: systemd-general: init.d-script-does-not-source-init-functions etc/init.d/systemd-general
-W: systemd-general: maintainer-script-calls-systemctl postrm:20
+W: systemd-general: maintainer-script-calls-systemctl postrm:6
 W: systemd-general: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/fifo-pipe-as-init
 W: systemd-general: systemd-service-file-refers-to-obsolete-target etc/systemd/system/test.service syslog.target

-- 
Debian package checker


Reply to: