[maven-debian-helper] 01/02: Remove the target directories even if 'mvn clean' fails when using DH

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch maven-debian-helper-2.0
in repository maven-debian-helper.

commit ca24430c8f901b6c088a8e1119aa86e9b5b3d919
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Nov 24 17:03:10 2015 +0100

    Remove the target directories even if 'mvn clean' fails when using DH
---
 debian/changelog    |  1 +
 share/perl/maven.pm | 11 +----------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6d97724..dda322c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ maven-debian-helper (2.0~exp2) UNRELEASED; urgency=medium
   * Team upload.
   * Added a dependency on libmaven-deploy-plugin-java to fix
     a build failure with some packages like avro-java.
+  * Remove the target directories even if 'mvn clean' fails when using DH
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 23 Nov 2015 22:57:59 +0100
 
diff --git a/share/perl/maven.pm b/share/perl/maven.pm
index 41dc6e8..6f318ba 100644
--- a/share/perl/maven.pm
+++ b/share/perl/maven.pm
@@ -127,19 +127,10 @@ sub clean {
 		$this->doit_in_builddir_noerror(@{$this->{maven_cmd}}, "clean");
 		doit("rm", "-r", "$this->{cwd}/debian/maven-repo");
 	}
+	$this->doit_in_builddir('for dir in $(find . -name target -type d); do if [ -f $(echo $dir | sed -e s/target$/pom.xml/) ]; then rm -Rf $dir; fi done');
 	$this->doit_in_sourcedir("mh_unpatchpoms", "-p$this->{package}");
 	doit("rm", "-f", "debian/stamp-poms-patched");
 	doit("mh_clean");
 }
 
-# FIXME: no standard check target to use here?
-#sub test {
-#	my $this=shift;
-#	$this->doit_in_builddir(@{$this->{maven_cmd}},
-#		"-Ddebian.dir=$this->{cwd}/debian",
-#		"-Ddebian.package=$this->{package}",
-#		"-Dinstall.to.usj=true",
-#		??);
-#}
-
 1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git