summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2004-02-22 20:00:54 +0000
committerjoey <joey>2004-02-22 20:00:54 +0000
commitadd24ceeca66be270dbfe3e7c6884d6a6f1aa1c9 (patch)
treec26f8e06f89d7d28e9dde262bf28ea79a3cab850
parent45bde2ca3f71bc2ff15e31e42df826707cb9c88a (diff)
r1667: * dh_installdocs: ignore .EX files as produced by dh-make.
* dh_movefiles: if the file cannot be found, do not go ahead and try to move it anyway, as this can produce unpredictable behavor with globs passed in from the shell. See bug #234105
-rwxr-xr-xdh_installdocs2
-rwxr-xr-xdh_movefiles14
2 files changed, 10 insertions, 6 deletions
diff --git a/dh_installdocs b/dh_installdocs
index f729186..ab7e53c 100755
--- a/dh_installdocs
+++ b/dh_installdocs
@@ -184,6 +184,8 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$regexp="(|$regexp)";
}
foreach my $fn (grep {/^${regexp}doc-base(\..*)?$/} readdir(DEB)) {
+ # .EX are example files, generated by eg, dh-make
+ next if $fn=~/\.EX$/;
# Parse the file to get the doc id.
open (IN, "debian/$fn") || die "Cannot read debian/$fn.";
while (<IN>) {
diff --git a/dh_movefiles b/dh_movefiles
index 7c3e70c..acd3b20 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -130,13 +130,15 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
$ret=1;
warning("$file not found (supposed to put it in $package)");
}
- $file=~s:^\Q$sourcedir\E/+::;
- my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
- if ($dh{EXCLUDE_FIND}) {
- $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+ else {
+ $file=~s:^\Q$sourcedir\E/+::;
+ my $cmd="(cd $sourcedir >/dev/null ; find $file ! -type d ";
+ if ($dh{EXCLUDE_FIND}) {
+ $cmd.="-a ! \\( $dh{EXCLUDE_FIND} \\) ";
+ }
+ $cmd.="-print || true) >> debian/movelist";
+ complex_doit($cmd);
}
- $cmd.="-print || true) >> debian/movelist";
- complex_doit($cmd);
}
my $pwd=`pwd`;
chomp $pwd;