[maven-debian-helper] 06/06: Revert "use getName() method to get file name of sourcePom"

[Emmanuel Bourg]

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

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

commit c26165d0fabd2027b61f065ce5d336a09c70261e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Jun 27 18:04:39 2016 +0200

    Revert "use getName() method to get file name of sourcePom"
    
    This reverts commit 21a777b4f8147270f09f0238be2757bb14a58c45.
---
 debian/changelog                                                      | 1 +
 .../src/main/java/org/debian/maven/packager/DependenciesSolver.java   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e5b38f0..e2c6072 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ maven-debian-helper (2.0.7) UNRELEASED; urgency=medium
     (Closes: #820161)
   * Fix "Using wrong path to mvnDebug when checking if apt-file"
     Updated path for mvnDebug in mh_make (Closes: #726609)
+  * DependancySolver displays the relative path to poms (Closes: #826433)
 
   [ Luca Vercelli ]
   * Fixed an error when copy-repo.sh encounters artifacts with ".pom"
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
index 7042552..86a422d 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
@@ -544,7 +544,9 @@ public class DependenciesSolver {
             return dependency;
         }
 
-        String sourcePomLoc = sourcePom.getName();
+        String sourcePomLoc = sourcePom.getAbsolutePath();
+        String baseDirPath = baseDir.getAbsolutePath();
+        sourcePomLoc = sourcePomLoc.substring(baseDirPath.length() + 1, sourcePomLoc.length());
         if (verbose) {
              System.out.println("Resolving " + dependency + (dependency.getScope() == null ? "" : " of scope " + dependency.getScope()) + "...");
         }

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