This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch bugfix/osx
in repository x2goclient.
commit a581a0ac57f8ca784528b180e0e13aa50020d00e
Author: Mihai Moldovan <io...@ionic.de>
Date: Thu Aug 27 20:50:45 2015 +0200
deduplicate.sh: cleanup as announced in the last commit - using
lazy_canonical_path.
---
debian/changelog | 2 ++
deduplicate.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 4367329..3d0c7d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -147,6 +147,8 @@ x2goclient (4.0.5.3-0x2go1) UNRELEASED; urgency=medium
good enough. Actually construct "the real dependency-format duplicate
string" and check it against "the real dependency". Even this is still
not good enough as it needs a bit cleanup - coming up next.
+ - deduplicate.sh: cleanup as announced in the last commit - using
+ lazy_canonical_path.
-- X2Go Release Manager <git-ad...@x2go.org> Mon, 19 Sep 2016 09:07:07 +0200
diff --git a/deduplicate.sh b/deduplicate.sh
index 7df0698..f8e5668 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -148,7 +148,7 @@ for entry in "${duplicates[@]}"; do
if [ -n "${filename}" ] && [ -n "${all_entry_filename}" ]; then
if [ "${filename}" = "${all_entry_filename}" ]; then
- typeset
dependency_format="${dependency_base_format}/${all_entry##${base_dir}}"
+ typeset
dependency_format="$(lazy_canonical_path
"${dependency_base_format}/${all_entry##${base_dir}}")"
to_files+=( "${dependency_format}" )
echo "${entry} => ${dependency_format}"
@@ -181,7 +181,7 @@ for all_entry in "${all_files[@]}"; do
for i in "${!duplicates[@]}"; do
typeset duplicate_entry="${duplicates[${i}]}"
echo "checking for duplicate ${duplicate_entry}"
- typeset
duplicate_format="${dependency_base_format}/${duplicate_entry}"
+ typeset duplicate_format="$(lazy_canonical_path
"${dependency_base_format}/${duplicate_entry}")"
if [ -n "${line}" ] && [ -n
"${duplicate_format}" ]; then
if [ "${line}" = "${duplicate_format}"
]; then
--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
http://lists.x2go.org/listinfo/x2go-commits
