[X2Go-Commits] [x2goclient] 71/139: deduplicate.sh: add more useful information in fixup section's error message.
git-admin at x2go.org
git-admin at x2go.org
Sun Jan 17 06:03:10 CET 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit 2471ad74f93a337faa3b37d4bfb5911d091a2c66
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 a786f20..f0bdc48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -143,6 +143,8 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
- 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:
- Change apache2-dev | libc6-dev build dependency back to apache2-dev
only. Otherwise, apache2-dev is not installed at all, even though
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
More information about the x2go-commits
mailing list