summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-01-25 12:54:35 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-01-25 12:54:35 +0000
commitf627ef19e6f521a73bc71af9c292d0a16c32d3a9 (patch)
tree63f0065a3899c90c831aa193aae3cbb939460547
parentddc509bc766fbde0eb8a5dfe9acb25fbce7b1aaf (diff)
downloadquilt-f627ef19e6f521a73bc71af9c292d0a16c32d3a9.tar.gz
- Fix pop command for recent coreutils (cp dir dir2/ no longer
works if dir2 doesn't yet exist).
-rw-r--r--quilt.changes6
-rw-r--r--quilt/pop.in2
2 files changed, 7 insertions, 1 deletions
diff --git a/quilt.changes b/quilt.changes
index 0ca72b0..8c3d8f4 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 25 13:53:23 CET 2005 - agruen@suse.de
+
+- Fix pop command for recent coreutils (cp dir dir2/ no longer
+ works if dir2 doesn't yet exist).
+
+-------------------------------------------------------------------
Sun Jan 23 19:27:17 CET 2005 - agruen@suse.de
- Add color support for push command output and allow to customize
diff --git a/quilt/pop.in b/quilt/pop.in
index 4e807b1..d0e19bf 100644
--- a/quilt/pop.in
+++ b/quilt/pop.in
@@ -110,7 +110,7 @@ check_for_pending_changes()
if [ -d $QUILT_PC/$patch ]
then
if ! rmdir $workdir || # note that this is racey...
- ! cp -rl $QUILT_PC/$patch $workdir/
+ ! cp -rl $QUILT_PC/$patch $workdir
then
printf $"Failed to copy files to temporary directory\n" >&2
rm -rf $workdir