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

lintian: r521 - in trunk: checks debian testset testset/binary/debian



Author: djpig
Date: 2005-12-17 22:40:02 +0100 (Sat, 17 Dec 2005)
New Revision: 521

Modified:
   trunk/checks/menu-format
   trunk/checks/menu-format.desc
   trunk/debian/changelog
   trunk/testset/binary/debian/menu
   trunk/testset/tags.binary
Log:
Drop su-to-root-with-usr-bin and su-to-root-without-usr-sbin, and add
su-to-root-with-usr-sbin to adapt to current menu package and policy
(Closes: #332400)


Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format	2005-12-17 21:01:44 UTC (rev 520)
+++ trunk/checks/menu-format	2005-12-17 21:40:02 UTC (rev 521)
@@ -326,13 +326,11 @@
 	$file_index{(split /\s+/, $_)[5]} = 1;
     }
     close FILE_INDEX;
-    
+
 	my @com=split(' ',$vals{'command'});
-	if ($com[0] eq "su-to-root") {
-	    tag "su-to-root-without-usr-sbin", "$fullname:$linecount";
-	} elsif ($com[0] eq "/usr/bin/su-to-root") {
-	    tag "su-to-root-with-usr-bin", "$fullname:$linecount";
-	} elsif ($com[0] eq "/usr/sbin/su-to-root") {
+	if ($com[0] eq "/usr/sbin/su-to-root") {
+	    tag "su-to-root-with-usr-sbin", "$fullname:$linecount";
+	} elsif ($com[0] =~ m,(/usr/bin/)?su-to-root,o) {
 	    shift @com;
 	    
             my $cmd;

Modified: trunk/checks/menu-format.desc
===================================================================
--- trunk/checks/menu-format.desc	2005-12-17 21:01:44 UTC (rev 520)
+++ trunk/checks/menu-format.desc	2005-12-17 21:40:02 UTC (rev 521)
@@ -130,26 +130,15 @@
 Info: The menu item command uses su-to-root without the -c flag. This is
  a syntax error, see su-to-root(1) for more information.
 
-Tag: su-to-root-with-usr-bin
-Type: error
-Info: The menu item command use su-to-root using /usr/bin/su-to-root.
- Usually, using absolute pathnames is bad. In this specific case however, you
- should use the absolute pathname of /usr/sbin/su-to-root.
+Tag: su-to-root-with-usr-sbin
+Type: warning
+Info: The menu item command uses su-to-root as /usr/sbin/su-to-root
+ Since sarge su-to-root is located in /usr/bin and /usr/sbin/su-to-root
+ is only a compatibility symlink that may get dropped in the future.
  .
- The reason for this is that the old Woody menu package had su-to-root
- exclusively in /usr/sbin, which is not in a regular user's $PATH.
- Therefore, the absolute pathname to su-to-root is still required for Sarge
- packages.
+ Since su-to-root is now located in /usr/bin you can use it without
+ absolute path now.
 
-Tag: su-to-root-without-usr-sbin
-Type: error
-Info: The menu item command use su-to-root without the full
- /usr/sbin/su-to-root path. The Woody version of menu does not have a
- su-to-root in a user's $PATH, unlike Sarge's version of menu.
- .
- Therefore, the absolute pathname to su-to-root is still required for Sarge
- packages.
-
 Tag: menu-item-needs-dwww
 Type: warning
 Info: The menu item has needs=dwww. This is deprecated. Instead, you should

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-12-17 21:01:44 UTC (rev 520)
+++ trunk/debian/changelog	2005-12-17 21:40:02 UTC (rev 521)
@@ -23,11 +23,14 @@
     + [FL] debhelper compat level 3 is deprecated as well now (Closes: #340222)
   * checks/files:
     + [FL] forgot /lib(32|64) (more #328612 fixes)
+  * checks/menu-format:
+    + [FL] Drop su-to-root-with-usr-bin and su-to-root-without-usr-sbin, and add
+      su-to-root-with-usr-sbin to adapt to current menu package and policy (Closes: #332400)
   * checks/po-debconf:
     + [FL] Fix logical error in search for files (Closes: #342707)
   * checks/scripts{.desc,}:
     + [FL] Drop install-fvwmgenmenu as valid interpreter. Was dropped from menu package before sarge.
-      (partly fixes: #332400)
+      (also for #332400, see checks/menu-format)
     + [FL] Change path for install-menu from /usr/sbin to /usr/bin (also for #332400)
   * checks/shared-libs:
     + [FL] forgot /lib(32|64) (hopefully finally closes: #328612)

Modified: trunk/testset/binary/debian/menu
===================================================================
--- trunk/testset/binary/debian/menu	2005-12-17 21:01:44 UTC (rev 520)
+++ trunk/testset/binary/debian/menu	2005-12-17 21:40:02 UTC (rev 521)
@@ -1,8 +1,8 @@
 ?package(binary):needs=text title="Hello World" command="/usr/bin/hello"
-?package(binary):needs=text section="Apps/System" title="Run cfdisk (0)" command="/usr/sbin/su-to-root cfdisk"
-?package(binary):needs="text" section="Apps/System" title="Run cfdisk (1)" command="/usr/sbin/su-to-root -p cfdisk"
-?package(binary):needs="x11" section="WindowManagers" title="Run xfdisk" command="su-to-root -c xfdisk"
-?package(binary):needs="wm" section="Apps/System" title="Run fdisk-wm" command="/usr/bin/su-to-root cfdisk"
+?package(binary):needs=text section="Apps/System" title="Run cfdisk (0)" command="/usr/bin/su-to-root cfdisk"
+?package(binary):needs="text" section="Apps/System" title="Run cfdisk (1)" command="su-to-root -p cfdisk"
+?package(binary):needs="x11" section="WindowManagers" title="Run xfdisk" command="/usr/sbin/su-to-root -c xfdisk"
+?package(binary):needs="wm" section="Apps/System" title="Run fdisk-wm" command="su-to-root -c hello"
 ?package(binary):needs="text" section="Apps/System" title="I'm not here!" command="/imnothere"
 ?package(binary,other-binary):needs="text" section="Apps/System" title="more than one required" command="other-bin -s omething"
 ?package(binary):needs="wmmodule" section="WindowManagers/Modules" title="somemodule" command="ModuleCmd"

Modified: trunk/testset/tags.binary
===================================================================
--- trunk/testset/tags.binary	2005-12-17 21:01:44 UTC (rev 520)
+++ trunk/testset/tags.binary	2005-12-17 21:40:02 UTC (rev 521)
@@ -8,14 +8,10 @@
 E: binary: postinst-does-not-call-updatemenus usr/lib/menu/binary
 E: binary: postrm-does-not-call-updatemenus usr/lib/menu/binary
 E: binary: statically-linked-binary ./usr/bin/static-hello
-E: binary: su-to-root-with-usr-bin /usr/lib/menu/binary:5
-E: binary: su-to-root-with-usr-bin /usr/share/menu/binary:5
 E: binary: su-to-root-without--c /usr/lib/menu/binary:2
 E: binary: su-to-root-without--c /usr/lib/menu/binary:3
 E: binary: su-to-root-without--c /usr/share/menu/binary:2
 E: binary: su-to-root-without--c /usr/share/menu/binary:3
-E: binary: su-to-root-without-usr-sbin /usr/lib/menu/binary:4
-E: binary: su-to-root-without-usr-sbin /usr/share/menu/binary:4
 E: binary: suidregister-used-in-maintainer-script postinst
 E: binary: unstripped-binary-or-object ./usr/bin/hello
 I: binary source: non-standard-architecture amd64
@@ -40,6 +36,8 @@
 W: binary: old-fsf-address-in-copyright-file
 W: binary: package-contains-hardlink usr/bar2 -> usr/share/baz
 W: binary: package-contains-upstream-install-documentation usr/share/doc/binary/INSTALL
+W: binary: su-to-root-with-usr-sbin /usr/lib/menu/binary:4
+W: binary: su-to-root-with-usr-sbin /usr/share/menu/binary:4
 W: binary: syntax-error-in-debian-changelog line 16 "couldn't parse date The, 15 Apr 2004 23:33:51 +0200"
 W: binary: unquoted-string-in-menu-item /usr/lib/menu/binary needs:1
 W: binary: unquoted-string-in-menu-item /usr/lib/menu/binary needs:2



Reply to: