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

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



Author: djpig
Date: 2004-05-09 02:49:27 +0200 (Sun, 09 May 2004)
New Revision: 265

Modified:
   trunk/checks/menu-format
   trunk/debian/changelog
   trunk/testset/binary/debian/menu
Log:
Commands for window manager's modules can't be expected
to be available as executables, so don't issue
menu-command-not-in-package in this case. Thanks to
Manoj Srivastava for reporting (Closes: #247805)


Modified: trunk/checks/menu-format
===================================================================
--- trunk/checks/menu-format	2004-05-09 00:43:13 UTC (rev 264)
+++ trunk/checks/menu-format	2004-05-09 00:49:27 UTC (rev 265)
@@ -305,6 +305,11 @@
 	}
     }
 
+    # Sanitize the section tag
+    my $section = $vals{'section'};
+	$section =~ tr:/:/:s;	# eliminate duplicate slashes.
+	$section =~ s:/$::;	# remove trailing slash.
+	
     # Read the file index:
     my %file_index;
     open(FILE_INDEX,"index") or fail("cannot open index file index: $!");
@@ -345,12 +350,14 @@
 		tag "su-to-root-without--c", "/usr/lib/menu/$menufile:$linecount";
 	    } else {   
 		tag "menu-command-not-in-package", "/usr/lib/menu/$menufile:$linecount"
-		    if (!$file_index{".$cmd"} && ($tested_packages < 2));
+		    if (!$file_index{".$cmd"} && ($tested_packages < 2)
+			&& ($section !~ m:^WindowManagers/Modules:));
 	    }
 	} else {
 	    tag "menu-command-not-in-package", "/usr/lib/menu/$menufile:$linecount $com[0]"
 	        if ($com[0] && !$file_index{".$com[0]"}
-                    && ($tested_packages < 2));
+		    && ($tested_packages < 2)
+		    && ($section !~ m:^WindowManagers/Modules:));
 	}
 
     if (exists($vals{'icon'})) {
@@ -363,11 +370,6 @@
 	VerifyIcon($menufile, $linecount, $vals{'icon16x16'}, 16);
     }
 
-    # Sanitize the section tag
-    my $section = $vals{'section'};
-	$section =~ tr:/:/:s;	# eliminate duplicate slashes.
-	$section =~ s:/$::;	# remove trailing slash.
-	
     # Check the needs tag.
     my $needs = lc($vals{'needs'}); # needs is case insensitive.
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-05-09 00:43:13 UTC (rev 264)
+++ trunk/debian/changelog	2004-05-09 00:49:27 UTC (rev 265)
@@ -23,6 +23,10 @@
       to pkg-not-in-package-test which is issued when the package is
       not in the list. Don't issue menu-command-not-in-package when
       we have a list.
+    + [FL] Commands for window manager's modules can't be expected
+      to be available as executables, so don't issue
+      menu-command-not-in-package in this case. Thanks to
+      Manoj Srivastava for reporting (Closes: #247805)
   * checks/po-debconf:
     + [JvW] Simply fail if stuff from gettext is missing.
   * checks/shared-libs:

Modified: trunk/testset/binary/debian/menu
===================================================================
--- trunk/testset/binary/debian/menu	2004-05-09 00:43:13 UTC (rev 264)
+++ trunk/testset/binary/debian/menu	2004-05-09 00:49:27 UTC (rev 265)
@@ -5,3 +5,4 @@
 ?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="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"
\ No newline at end of file



Reply to: