diff options
author | dancer <dancer> | 2002-10-23 10:16:13 +0000 |
---|---|---|
committer | dancer <dancer> | 2002-10-23 10:16:13 +0000 |
commit | 948441afa4164677374c76e266f6431117db6cbd (patch) | |
tree | 97040f719f712f716171b9f9642edc44e355ed97 | |
parent | 7654e3618a501d1fc1323eed85546bec06f36ec3 (diff) | |
download | pbuilder-948441afa4164677374c76e266f6431117db6cbd.tar pbuilder-948441afa4164677374c76e266f6431117db6cbd.tar.gz |
+
+ * pbuilder-buildpackage-funcs: clean up when dsc-file copying into chroot fails.
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | pbuilder-buildpackage-funcs | 4 |
3 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2002-10-23 Junichi Uekawa <dancer@debian.org> + + * pbuilder-buildpackage-funcs: clean up when dsc-file copying into chroot fails. + 2002-10-19 Junichi Uekawa <dancer@debian.org> * debian/TODO: beautify file, with Todoo mode. diff --git a/debian/changelog b/debian/changelog index 5db127d..cddf6f2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ pbuilder (0.45) UNRELEASED; urgency=low * hack HOME to the fakerooted user when fakerooting, to hopefully fool - GNUStep builds. + GNUStep builds, etc. * Standards-Version: 3.5.7. * Build-dep on debhelper 4.1.0 or greater, which removed usr/doc symlink. + * fix failure cases when initial *dsc file is invalid. - -- Junichi Uekawa <dancer@debian.org> Sat, 19 Oct 2002 12:44:53 +0900 + -- Junichi Uekawa <dancer@debian.org> Wed, 23 Oct 2002 19:16:40 +0900 pbuilder (0.44) unstable; urgency=low diff --git a/pbuilder-buildpackage-funcs b/pbuilder-buildpackage-funcs index c0ad51d..76dd913 100644 --- a/pbuilder-buildpackage-funcs +++ b/pbuilder-buildpackage-funcs @@ -26,7 +26,9 @@ function copydsc () { $(cat "$DSCFILE" | \ awk 'BEGIN{p=0} /^$/ {p=0} /^.*:/ {p=0} {if (p){print "'$(dirname "$DSCFILE")'/" $3}} /^Files:/{p=1}' ) ; do echo " -> copying [$FILE]" - cp "$FILE" "$TARGET" ; + if ! cp "$FILE" "$TARGET" ; then + umountproc_cleanbuildplace + fi done } |