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

[SCM] Debian package checker branch, master, updated. 2.4.1-9-g1c995c8



The following commit has been merged in the master branch:
commit 1c995c8e89fd2aece83b7595675063c7cd453cbf
Author: Raphael Geissert <atomo64@gmail.com>
Date:   Sat May 8 23:18:12 2010 -0500

    Disable etch compatibility code in objdump-info
    
    readelf is no longer used but the plan is to use it instead of
    objdump-info.
    
    * collection/objdump-info:
      + [RG] Disable etch compatibility code.

diff --git a/collection/objdump-info b/collection/objdump-info
index c6d6313..3e15c88 100755
--- a/collection/objdump-info
+++ b/collection/objdump-info
@@ -39,11 +39,10 @@ open (FILES, '<', "file-info")
 open (OUT, '>', "objdump-info")
     or fail("cannot open objdump-info: $!");
 
-open(PIPE, '-|', "dpkg-query -W -f='\${Version}\n' binutils")
-    or fail("unable to run dpkg-query: $!");
-my $binutils_version = <PIPE>;
-chomp $binutils_version;
-close PIPE;
+# Disable etch compatibility code.
+# Running dpkg-query every time is too expensive
+# readelf code is not dropped as per private/TODO entry
+my $etch_compat = 0;
 
 chdir ("unpacked")
     or fail ("unable to chdir to unpacked: $!\n");
@@ -94,7 +93,7 @@ while (<FILES>) {
 
 	    last if $failed;
 
-	    if ($invalidop or $binutils_version !~ m/^2\.17/) {
+	    if ($invalidop or !$etch_compat) {
 		# If we're using a binutils newer than etch's then either
 		# "invalid operation" or "file format not recognized"
 		# are simply passed through to the checks scripts
diff --git a/debian/changelog b/debian/changelog
index 446f901..cb87add 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,8 @@ lintian (2.4.2) UNRELEASED; urgency=low
     + [RA] Fix typo in long description of duplicated-key-in-desktop-entry.
       Thanks, Niels Thykier.  (Closes: #580700)
 
+  * collection/objdump-info:
+    + [RG] Disable etch compatibility code.
   * collection/strings:
     + [RG] Correctly handle ELF binaries with whitespaces in their name.
       (LP: #540342)

-- 
Debian package checker


Reply to: