Improve error messages when child commands fail.

[debhelper.git] / dh_link

diff --git a/dh_link b/dh_link
index 84e6ba359bef31bebec1746f2ba61cd2020f8f79..dc396dd597fbae1516a9c7657e56c0a7f41dc9e1 100755 (executable)
--- a/dh_link
+++ b/dh_link
@@ -12,7 +12,7 @@ use Debian::Debhelper::Dh_Lib;
 
 =head1 SYNOPSIS
 
 
 =head1 SYNOPSIS
 

-B<dh_link> [S<I<debhelper options>>] [B<-A>] [S<I<source destination ...>>]
+B<dh_link> [S<I<debhelper options>>] [B<-A>] [B<-X>I<item>] [S<I<source destination ...>>]

 
 =head1 DESCRIPTION
 
 
 =head1 DESCRIPTION
 


@@ -54,6 +54,11 @@ conform to debian policy, and corrects them (v4 or later).
 Create any links specified by command line parameters in ALL packages
 acted on, not just the first.
 
 Create any links specified by command line parameters in ALL packages
 acted on, not just the first.
 

+=item B<-Xitem>, B<--exclude=item>
+
+Do not correct symlinks that contain "item" anywhere in their filename from
+being corrected to comply with debian policy.
+

 =item I<source destination ...>
 
 Create a file named "destination" as a link to a file named "source". Do
 =item I<source destination ...>
 
 Create a file named "destination" as a link to a file named "source". Do


@@ -145,6 +150,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                find(
                        sub {
                                return unless -l;
                find(
                        sub {
                                return unless -l;

+                               return if excludefile($_);

                                my $dir=$File::Find::dir;
                                $dir=~s/^\Q$tmp\E//;
                                my $target = readlink($_);
                                my $dir=$File::Find::dir;
                                $dir=~s/^\Q$tmp\E//;
                                my $target = readlink($_);