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

lintian: r1133 - in trunk: checks debian testset testset/scripts testset/scripts/debian



Author: rra
Date: 2008-01-22 05:24:55 +0100 (Tue, 22 Jan 2008)
New Revision: 1133

Added:
   trunk/testset/scripts/init-lsb-other
Modified:
   trunk/checks/init.d
   trunk/checks/init.d.desc
   trunk/debian/changelog
   trunk/testset/scripts/debian/postinst
   trunk/testset/scripts/debian/postrm
   trunk/testset/scripts/debian/rules
   trunk/testset/scripts/debian/scripts.conffiles
   trunk/testset/tags.scripts
Log:
* checks/init.d{.desc,}:
  + [RA] Downgrade a missing LSB Short-Description keyword to info since
    it's not required for functionality.  Thanks, Petter Reinholdtsen.
    (Closes: #460499)

Modified: trunk/checks/init.d
===================================================================
--- trunk/checks/init.d	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/checks/init.d	2008-01-22 04:24:55 UTC (rev 1133)
@@ -204,7 +204,11 @@
 	} else {
 	    for my $keyword (keys %lsb_keywords) {
 		if ($lsb_keywords{$keyword} && !defined $lsb{$keyword}) {
-		    tag "init.d-script-missing-lsb-keyword", "/etc/init.d/$_ $keyword";
+		    if ($keyword eq 'short-description') {
+			tag "init.d-script-missing-lsb-short-description", "/etc/init.d/$_";
+		    } else {
+			tag "init.d-script-missing-lsb-keyword", "/etc/init.d/$_ $keyword";
+		    }
 		}
 	    }
 	}

Modified: trunk/checks/init.d.desc
===================================================================
--- trunk/checks/init.d.desc	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/checks/init.d.desc	2008-01-22 04:24:55 UTC (rev 1133)
@@ -135,6 +135,14 @@
  should be empty, please still include it in the LSB keyword section with
  an empty value.
 
+Tag: init.d-script-missing-lsb-short-description
+Type: info
+Ref: http://wiki.debian.org/LSBInitScripts
+Info: This <tt>/etc/init.d</tt> script has an LSB keyword section, but it
+ is missing a Short-Description LSB keyword.  This field isn't directly
+ used currently, but adding it is still a good idea for documentation
+ purposes.
+
 Tag: init.d-script-has-bad-start-runlevel
 Type: warning
 Ref: http://wiki.debian.org/LSBInitScripts

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/debian/changelog	2008-01-22 04:24:55 UTC (rev 1133)
@@ -12,6 +12,10 @@
   * checks/files.desc:
     + [RA] In many of the long descriptions for symlink-related tags,
       mention that running dh_link will fix symlink problems.
+  * checks/init.d{.desc,}:
+    + [RA] Downgrade a missing LSB Short-Description keyword to info since
+      it's not required for functionality.  Thanks, Petter Reinholdtsen.
+      (Closes: #460499)
   * checks/menu-format:
     + [RA] Avoid a Perl warning for desktop entries without Exec.
 

Modified: trunk/testset/scripts/debian/postinst
===================================================================
--- trunk/testset/scripts/debian/postinst	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/testset/scripts/debian/postinst	2008-01-22 04:24:55 UTC (rev 1133)
@@ -9,3 +9,6 @@
 if [ -x "/etc/init.d/skeleton" ] ; then
     update-rc.d skeleton defaults >/dev/null
 fi
+if [ -x "/etc/init.d/lsb-other" ] ; then
+    update-rc.d lsb-other defaults >/dev/null
+fi

Modified: trunk/testset/scripts/debian/postrm
===================================================================
--- trunk/testset/scripts/debian/postrm	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/testset/scripts/debian/postrm	2008-01-22 04:24:55 UTC (rev 1133)
@@ -4,4 +4,6 @@
     update-rc.d lsb-broken remove >/dev/null
     update-rc.d no-lsb remove >/dev/null
     update-rc.d skeleton remove >/dev/null
+    update-rc.d lsb-other remove >/dev/null
+    update-rc.d lsb-other remove >/dev/null
 fi

Modified: trunk/testset/scripts/debian/rules
===================================================================
--- trunk/testset/scripts/debian/rules	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/testset/scripts/debian/rules	2008-01-22 04:24:55 UTC (rev 1133)
@@ -50,6 +50,7 @@
 	install -m 755 init-skeleton $(tmp)/etc/init.d/skeleton
 	install -m 755 init-no-lsb $(tmp)/etc/init.d/no-lsb
 	install -m 755 init-lsb-broken $(tmp)/etc/init.d/lsb-broken
+	install -m 755 init-lsb-other $(tmp)/etc/init.d/lsb-other
 
 	install -m 755 phpfoo $(tmp)/usr/share/scripts/
 	sed 's/php$$/php5/' phpfoo > $(tmp)/usr/share/scripts/php5foo

Modified: trunk/testset/scripts/debian/scripts.conffiles
===================================================================
--- trunk/testset/scripts/debian/scripts.conffiles	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/testset/scripts/debian/scripts.conffiles	2008-01-22 04:24:55 UTC (rev 1133)
@@ -1,4 +1,5 @@
 /etc/init.d/lsb-broken
+/etc/init.d/lsb-other
 /etc/init.d/no-lsb
 /etc/X11/Xsession.d/xsession-test
 /etc/csh/login.d/csh-foo

Added: trunk/testset/scripts/init-lsb-other
===================================================================
--- trunk/testset/scripts/init-lsb-other	                        (rev 0)
+++ trunk/testset/scripts/init-lsb-other	2008-01-22 04:24:55 UTC (rev 1133)
@@ -0,0 +1,22 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:          lsb-other
+# Required-Start:    $local_fs $remote_fs
+# Required-Stop:     $local_fs $remote_fs
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Description:       This is another LSB script test, which has a missing
+#  Short-Description.
+### END INIT INFO
+
+case "$1" in
+  start|stop|restart|reload|force-reload)
+        echo "Blah"
+        ;;
+  *)
+        echo "Usage: foo start" >&2
+        exit 3
+        ;;
+esac
+
+:

Modified: trunk/testset/tags.scripts
===================================================================
--- trunk/testset/tags.scripts	2008-01-22 01:39:20 UTC (rev 1132)
+++ trunk/testset/tags.scripts	2008-01-22 04:24:55 UTC (rev 1133)
@@ -2,6 +2,7 @@
 E: scripts source: package-uses-debhelper-but-lacks-build-depends
 E: scripts: calls-suidperl-directly ./usr/bin/suidperlfoo
 E: scripts: copyright-file-lacks-pointer-to-perl-license
+E: scripts: duplicate-updaterc.d-calls-in-postrm lsb-other
 E: scripts: file-in-etc-not-marked-as-conffile /etc/init.d/skeleton
 E: scripts: init.d-script-does-not-implement-required-option /etc/init.d/lsb-broken force-reload
 E: scripts: init.d-script-does-not-implement-required-option /etc/init.d/lsb-broken restart
@@ -16,6 +17,7 @@
 E: scripts: suid-perl-script-but-no-perl-suid-dep ./usr/bin/suidperlfoo2
 E: scripts: wrong-path-for-interpreter #!/bin/ruby1.8 != /usr/bin/ruby1.8 (./usr/bin/rubyfoo)
 E: scripts: wrong-path-for-interpreter #!/usr/local/bin/lefty != /usr/bin/lefty (./usr/bin/lefty-foo)
+I: scripts: init.d-script-missing-lsb-short-description /etc/init.d/lsb-other
 I: scripts: no-md5sums-control-file
 W: scripts source: ancient-standards-version 3.2.1 (current is 3.7.3)
 W: scripts source: binary-arch-rules-but-pkg-is-arch-indep


Reply to: