[X2Go-Commits] [x2goclient] 70/217: deduplicate.sh: add more useful information in fixup section's error message.

[git-admin at x2go.org]

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

x2go pushed a commit to branch bugfix/osx
in repository x2goclient.

commit 5b81608fa6472504130a7d28ee98da0a3a6eecab
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Aug 27 05:06:04 2015 +0200

    deduplicate.sh: add more useful information in fixup section's error message.
---
 debian/changelog |    2 ++
 deduplicate.sh   |    4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1870fd6..bcaa794 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -159,6 +159,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
     - deduplicate.sh: switch to range-based for loop in fixup section for
       duplicate array walking as we need to access the same element index in
       the replacement array.
+    - deduplicate.sh: add more useful information in fixup section's error
+      message.
   * debian/control:
     - Maintainer change in package: X2Go Developers <x2go-dev at lists.x2go.org>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index d625590..7dc6cd0 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -162,7 +162,9 @@ for all_entry in "${all_files[@]}"; do
 				if [ -n "${dependencies_filename}" ] && [ -n "${duplicate_filename}"]; then
 					
 				else
-					echo "ERROR: empty file name while duplicates with dependencies." >&2
+					echo "ERROR: empty file name while replacing duplicate dependencies." >&2
+					echo "ERROR: for file ${all_entry}" >&2
+					echo "ERROR: at dependency ${line}" >&2
 					echo "ERROR: duplicate entry: \"${duplicate_entry}\"" >&2
 					echo "ERROR: dependency: \"${line}\"" >&2
 					exit 1

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git