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

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



Author: he
Date: 2007-11-30 10:23:42 +0100 (Fri, 30 Nov 2007)
New Revision: 999

Added:
   trunk/testset/scripts/csh-foo
Modified:
   trunk/checks/scripts
   trunk/debian/changelog
   trunk/testset/scripts/debian/rules
   trunk/testset/scripts/debian/scripts.conffiles
Log:
* checks/scripts:
  + [HE] Allow packages to drop snippets into /etc/csh/login.d
         without a dependency on csh. Files there should also
         be allowed to have csh in the shebang line. (Closes: #453417)

Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts	2007-11-30 09:06:53 UTC (rev 998)
+++ trunk/checks/scripts	2007-11-30 09:23:42 UTC (rev 999)
@@ -317,7 +317,8 @@
 		} else {
 		    tag("missing-dep-for-interpreter",
 			"$base => $deps[0]", "($filename)")
-			unless Dep::implies($deps{all}, Dep::parse($interpreter_dependencies{$base}));
+			unless (Dep::implies($deps{all}, Dep::parse($interpreter_dependencies{$base})) ||
+			($base eq "csh" && $filename =~ m,^./etc/csh/login.d/,));
 		}
 	    } elsif ($base =~ /^python(\d.\d)?$/) {
 		my $ver = $1 ? $1 : "";
@@ -364,7 +365,8 @@
     }
 
     tag("csh-considered-harmful", $filename)
-        if (($base eq 'csh' or $base eq 'tcsh') and $executable{$filename});
+        if (($base eq 'csh' or $base eq 'tcsh') and $executable{$filename}
+	    and $filename !~ m,^./etc/csh/login.d/,);
 
     # Don't syntax-check scripts in /usr/src that end in .dpatch.  bash -n
     # doesn't stop checking at exit 0 and goes on to blow up on the patch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-11-30 09:06:53 UTC (rev 998)
+++ trunk/debian/changelog	2007-11-30 09:23:42 UTC (rev 999)
@@ -23,6 +23,10 @@
            stolen from linda. (Closes: #452839)
     + [HE] Check for Section field in source packages, for which it
            is mandatory. Joerg Jaspert made me do this.
+  * checks/scripts:
+    + [HE] Allow packages to drop snippets into /etc/csh/login.d
+           without a dependency on csh. Files there should also
+           be allowed to have csh in the shebang line. (Closes: #453417)
 
   * debian/control:
     + [TK] Add Vcs-* fields to point to Lintian's repository.

Added: trunk/testset/scripts/csh-foo
===================================================================
--- trunk/testset/scripts/csh-foo	2007-11-30 09:06:53 UTC (rev 998)
+++ trunk/testset/scripts/csh-foo	2007-11-30 09:23:42 UTC (rev 999)
@@ -0,0 +1,2 @@
+#! /bin/csh
+

Modified: trunk/testset/scripts/debian/rules
===================================================================
--- trunk/testset/scripts/debian/rules	2007-11-30 09:06:53 UTC (rev 998)
+++ trunk/testset/scripts/debian/rules	2007-11-30 09:23:42 UTC (rev 999)
@@ -10,6 +10,7 @@
 	install -d $(tmp)/usr/bin/
 	install -d $(tmp)/etc/X11/Xsession.d/
 	install -d $(tmp)/etc/init.d/
+	install -d $(tmp)/etc/csh/login.d/
 	install -d $(tmp)/usr/share/scripts/
 	install -d $(tmp)/usr/share/doc/scripts/
 	install -d $(tmp)/usr/lib/python2.3/site-packages/
@@ -17,6 +18,7 @@
 	install -d $(tmp)/usr/src/scripts
 	install -d $(tmp)/DEBIAN
 
+	install -m 755 csh-foo $(tmp)/etc/csh/login.d/ 
 	install -m 755 envfoo $(tmp)/usr/bin/
 	install -m 755 pyfoo $(tmp)/usr/bin/
 	install -m 755 py2foo $(tmp)/usr/bin/
@@ -80,6 +82,6 @@
 binary: binary-arch binary-indep
 
 clean:
-	rm -rf debian/files $(tmp)
+	rm -rf debian/files $(tmp) debian/substvars
 
 .PHONY: build binary-arch binary-indep binary clean

Modified: trunk/testset/scripts/debian/scripts.conffiles
===================================================================
--- trunk/testset/scripts/debian/scripts.conffiles	2007-11-30 09:06:53 UTC (rev 998)
+++ trunk/testset/scripts/debian/scripts.conffiles	2007-11-30 09:23:42 UTC (rev 999)
@@ -1,3 +1,4 @@
 /etc/init.d/lsb-broken
 /etc/init.d/no-lsb
 /etc/X11/Xsession.d/xsession-test
+/etc/csh/login.d/csh-foo



Reply to: