summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2003-04-12 23:33:27 +0000
committerjoey <joey>2003-04-12 23:33:27 +0000
commit0d919d2978cd12f6a6af3bf00003c38c84fd0a56 (patch)
tree751e34694bc15f92e0941fb5d9b53c5a63d76559
parentdfc48628ab06f010bb18454d5d8e8701b1bcf58a (diff)
downloaddebhelper-0d919d2978cd12f6a6af3bf00003c38c84fd0a56.tar.gz
r583: * dh_movefiles: Do not pass --remove-files to tar, since that makes
it break hard links (see #188663).
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_movefiles5
2 files changed, 11 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 2222d3d8..e7c9bb6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (4.1.41) unstable; urgency=low
+
+ * dh_movefiles: Do not pass --remove-files to tar, since that makes
+ it break hard links (see #188663).
+
+ -- Joey Hess <joeyh@debian.org> Sat, 12 Apr 2003 17:11:28 -0400
+
debhelper (4.1.40) unstable; urgency=low
* Fix build with 077 umask. Closes: #187757
diff --git a/dh_movefiles b/dh_movefiles
index cc1af45e..8762487a 100755
--- a/dh_movefiles
+++ b/dh_movefiles
@@ -140,7 +140,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
}
my $pwd=`pwd`;
chomp $pwd;
- complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+ complex_doit("(cd $sourcedir >/dev/null ; tar --create --files-from=$pwd/debian/movelist --file -) | (cd $tmp >/dev/null ;tar xpf -)");
+ # --remove-files is not used above because tar then doesn't
+ # preserve hard links
+ complex_doit("cd $sourcedir >/dev/null ; cat $pwd/debian/movelist | xargs rm -f)");
doit("rm","-f","debian/movelist");
}
}