summaryrefslogtreecommitdiff
path: root/dh_movefiles
diff options
context:
space:
mode:
authorjoey <joey>2000-10-23 22:36:18 +0000
committerjoey <joey>2000-10-23 22:36:18 +0000
commit307194e33ae1856238c94a07818d9dfd4712f52f (patch)
tree81f5303697245412047cea4f4b42371c379f74f8 /dh_movefiles
parentd4cac755fed44798d07c5b598d8906e74d8e5293 (diff)
r378: * dh_movefiles: fixed a regexp quoting problem with --sourcedir.
Closes: #75434 * Whoops, I think I overwrote bod's NMU with 2.2.15. Let's merge those in: . debhelper (2.1.14-0.1) unstable; urgency=low . * Non-maintainer upload (thanks Joey). * dh_installchangelogs, dh_installdocs: allow dangling symlinks for $TMP/usr/share/doc/$PACKAGE (useful for multi-binary packages). Closes: #53381 . -- Brendan O'Dea <bod@debian.org> Fri, 20 Oct 2000 18:11:59 +1100 . I also added some documentation to debhelper.1 about this, and removed the TODO entry about it.
Diffstat (limited to 'dh_movefiles')
-rwxr-xr-xdh_movefiles4
1 files changed, 2 insertions, 2 deletions
diff --git a/dh_movefiles b/dh_movefiles
index ad9add2..60e16f1 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -60,13 +60,13 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
foreach (@filelist) {
$file=$_;
$ret=1 if (! -e $file && ! -l $file);
- $file=~s:^$sourcedir/+::;
+ $file=~s:^\Q$sourcedir\E/+::;
complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and ! -type l -print || true) >> debian/movelist");
}
foreach (@filelist) {
$file=$_;
$ret=1 if (! -e $file && ! -l $file);
- $file=~s:^$sourcedir/+::;
+ $file=~s:^\Q$sourcedir\E/+::;
complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and -type l -print || true) >> debian/movelist");
}
complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=../movelist --file -) | (cd $TMP >/dev/null ;tar xpf -)");