[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: give better hint at the failure

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 448805c6452b1f15e861796e90af0504cd847bf7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Sep 6 16:08:02 2015 +0200

    reproducible: give better hint at the failure
---
 bin/schroot-create.sh       | 2 +-
 logparse/reproducible.rules | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 341fe9a..2d4bc3c 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -158,7 +158,7 @@ bootstrap() {
 
 cleanup() {
 	if [ -d $CHROOT_TARGET ]; then
-		sudo rm -rf --one-file-system $CHROOT_TARGET || ( echo "Warning: $CHROOT_TARGET could not be fully removed." ; fuser -mv $CHROOT_TARGET ; ls $CHROOT_TARGET -la )
+		sudo rm -rf --one-file-system $CHROOT_TARGET || ( echo "Warning: $CHROOT_TARGET could not be fully removed on forced cleanup." ; fuser -mv $CHROOT_TARGET ; ls $CHROOT_TARGET -la )
 	fi
 }
 trap cleanup INT TERM EXIT
diff --git a/logparse/reproducible.rules b/logparse/reproducible.rules
index 0856d5d..6a2d45f 100644
--- a/logparse/reproducible.rules
+++ b/logparse/reproducible.rules
@@ -8,7 +8,7 @@ warning /Warning: lock .+ still exists, exiting./
 warning /Warning: Tried, but failed to delete these:/
 warning /Warning: processes found which should not be there/
 warning /Warning: Found files with bad permissions.+/
-warning /Warning: .+ could not be fully removed./
+warning /Warning: .+ could not be fully removed.+/
 warning /Warning: could not download.+/
 warning /Warning: cannot update html pages for.+/
 warning /Warning: package .+is probably already building elsewhere, exiting./

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git