Prechádzať zdrojové kódy

Dpkg::Shlibs::Objdump: accept filenames with spaces and colons

Raphaël Hertzog 16 rokov pred
rodič
commit
4616b554a7
2 zmenil súbory, kde vykonal 4 pridanie a 1 odobranie
  1. 3 0
      debian/changelog
  2. 1 1
      scripts/Dpkg/Shlibs/Objdump.pm

+ 3 - 0
debian/changelog

@@ -11,6 +11,9 @@ dpkg (1.15.6) UNRELEASED; urgency=low
     corresponding keyring is in debian-keyring.
   * Merge support of symbol patterns in dpkg-gensymbols. Thanks to
     Modestas Vainius for his work (see further for more details).
+  * Accept filename with spaces and colon in the output of objdump.
+    Required so that dpkg-shlibdeps support such files properly.
+    Thanks to Raphaël Geissert for the patch. Closes: #565712
 
   [ Guillem Jover ]
   * Handle argument parsing in dpkg-checkbuilddeps and dpkg-scanpackages

+ 1 - 1
scripts/Dpkg/Shlibs/Objdump.pm

@@ -216,7 +216,7 @@ sub _parse {
                 }
 	    }
 	} elsif ($section eq "none") {
-	    if (/^\s*\S+:\s*file\s+format\s+(\S+)\s*$/) {
+	    if (/^\s*.+:\s*file\s+format\s+(\S+)\s*$/) {
 		$self->{format} = $1;
 	    } elsif (/^architecture:\s*\S+,\s*flags\s*\S+:\s*$/) {
 		# Parse 2 lines of "-f"