[X2Go-Commits] [x2goclient] 76/116: deduplicate.sh: more temporary debugging output in fixup section.

git-admin at x2go.org git-admin at x2go.org
Mon Nov 30 05:07:58 CET 2015


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

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

commit 72d52f056a63a797ec60a374550509460f98e693
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Aug 27 20:40:46 2015 +0200

    deduplicate.sh: more temporary debugging output in fixup section.
---
 debian/changelog |    1 +
 deduplicate.sh   |    2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 81b06d1..017227f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -137,6 +137,7 @@ x2goclient (4.0.5.1-0x2go1) UNRELEASED; urgency=low
       variable and use that instead of repeating a fixed string.
     - deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
       deduplicate.sh will eventually be merged into macbuild.sh anyway.
+    - deduplicate.sh: more temporary debugging output in fixup section.
 
   [ Oleksandr Shneyder ]
   * New upstream release (4.0.5.1):
diff --git a/deduplicate.sh b/deduplicate.sh
index dadf334..12732a4 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -175,12 +175,14 @@ for all_entry in "${all_files[@]}"; do
 		typeset line=""
 		while read -r line; do
 			typeset dependencies_filename="$(basename "${line}")"
+			echo "dependency of ${all_entry}: ${line}"
 
 			typeset duplicate_entry=""
 			typeset -i i="0"
 			for i in "${!duplicates[@]}"; do
 				typeset duplicate_entry="${duplicates[${i}]}"
 				typeset duplicate_filename="$(basename "${duplicate_entry}")"
+				echo "checking for duplicate ${duplicate_entry}"
 
 				if [ -n "${dependencies_filename}" ] && [ -n "${duplicate_filename}" ]; then
 					if [ "${dependencies_filename}" = "${duplicate_filename}" ]; then

--
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