[debhelper-devel] [debhelper] 02/02: dh_shlibdeps: Re-indent code

Niels Thykier nthykier at moszumanska.debian.org
Sat Jun 24 12:59:40 UTC 2017


This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit bef90b938018538b6680d5fc11378e4bff1a109c
Author: Niels Thykier <niels at thykier.net>
Date:   Sat Jun 24 12:49:34 2017 +0000

    dh_shlibdeps: Re-indent code
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 dh_shlibdeps | 78 ++++++++++++++++++++++++++++++------------------------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/dh_shlibdeps b/dh_shlibdeps
index f60a787..80d992a 100755
--- a/dh_shlibdeps
+++ b/dh_shlibdeps
@@ -105,52 +105,52 @@ if (defined $dh{V_FLAG}) {
 }
 
 on_pkgs_in_parallel {
-foreach my $package (@_) {
-	my $tmp=tmpdir($package);
-	my $ext=pkgext($package);
-	my (@filelist, $ff);
-
-	# Generate a list of ELF binaries in the package, ignoring any
-	# we were told to exclude.
-	my $find_options='';
-	if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
-		$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
-	}
-	foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" -or -name "*.node" \\) $find_options -print`)) {
-		# Prune directories that contain separated debug symbols.
-		next if $file=~m!^\Q$tmp\E/usr/lib/debug/!;
-		# TODO this is slow, optimize. Ie, file can run once on
-		# multiple files..
-		$ff=`file "$file"`;
-		if ($ff=~m/ELF/ && $ff!~/statically linked/) {
-			push @filelist,$file;
+	foreach my $package (@_) {
+		my $tmp=tmpdir($package);
+		my $ext=pkgext($package);
+		my (@filelist, $ff);
+
+		# Generate a list of ELF binaries in the package, ignoring any
+		# we were told to exclude.
+		my $find_options='';
+		if (defined($dh{EXCLUDE_FIND}) && $dh{EXCLUDE_FIND} ne '') {
+			$find_options="! \\( $dh{EXCLUDE_FIND} \\)";
+		}
+		foreach my $file (split(/\n/,`find $tmp -type f \\( -perm /111 -or -name "*.so*" -or -name "*.cmxs" -or -name "*.node" \\) $find_options -print`)) {
+			# Prune directories that contain separated debug symbols.
+			next if $file=~m!^\Q$tmp\E/usr/lib/debug/!;
+			# TODO this is slow, optimize. Ie, file can run once on
+			# multiple files..
+			$ff=`file "$file"`;
+			if ($ff=~m/ELF/ && $ff!~/statically linked/) {
+				push @filelist,$file;
+			}
 		}
-	}
 
-	if (@filelist) {
-		my @opts;
+		if (@filelist) {
+			my @opts;
 
-		# dpkg-shlibdeps expects this directory to exist
-		install_dir("$tmp/DEBIAN");
+			# dpkg-shlibdeps expects this directory to exist
+			install_dir("$tmp/DEBIAN");
 
-		if (defined($dh{LIBPACKAGE})) {
-			@opts = map { '-S' . tmpdir($_) } @{$dh{LIBPACKAGE}};
-		}
-		
-		push @opts, "-tudeb" if is_udeb($package);
-		
-		if ($dh{L_PARAMS}) {
-			foreach (split(/:/, $dh{L_PARAMS})) {
-				# Force the path absolute.
-				my $libdir = m:^/: ? $_ : "/$_";
-				push @opts, "-l$libdir";
+			if (defined($dh{LIBPACKAGE})) {
+				@opts = map { '-S' . tmpdir($_) } @{$dh{LIBPACKAGE}};
 			}
+
+			push @opts, "-tudeb" if is_udeb($package);
+
+			if ($dh{L_PARAMS}) {
+				foreach (split(/:/, $dh{L_PARAMS})) {
+					# Force the path absolute.
+					my $libdir = m:^/: ? $_ : "/$_";
+					push @opts, "-l$libdir";
+				}
+			}
+
+			doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",
+				@opts,@{$dh{U_PARAMS}}, at filelist);
 		}
-		
-		doit("dpkg-shlibdeps","-Tdebian/${ext}substvars",
-			@opts,@{$dh{U_PARAMS}}, at filelist);
 	}
-}
 };
 
 =head1 SEE ALSO

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git




More information about the debhelper-devel mailing list