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

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

commit d9bf7f1d6e72ad8ad251a2092cb5471233499f13
Author: Mihai Moldovan <[email protected]>
Date:   Thu Aug 27 20:39:24 2015 +0200

    deduplicate.sh: copy lazy_canonical_path from macbuild.sh for now.
    
    deduplicate.sh will eventually be merged into macbuild.sh anyway.
---
 debian/changelog |    2 ++
 deduplicate.sh   |   12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5fda8b2..f44c68f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,6 +168,8 @@ x2goclient (4.0.5.2-0x2go1) UNRELEASED; urgency=medium
       output.
     - deduplicate.sh: save dependency format base string as a readonly
       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.
   * debian/control:
     - Maintainer change in package: X2Go Developers <[email protected]>.
     - Uploaders: add myself. Also, force a rebuild due to the changed
diff --git a/deduplicate.sh b/deduplicate.sh
index 130a04e..dadf334 100755
--- a/deduplicate.sh
+++ b/deduplicate.sh
@@ -52,6 +52,18 @@ set +x
        return 0
 }
 
+lazy_canonical_path() {
+       typeset path="${1}"
+
+       typeset old_path=""
+       while [ "${old_path}" != "${path}" ]; do
+               old_path="${path}"
+               path="${path//\/\///}"
+       done
+
+       printf "${old_path}"
+}
+
 typeset -a all_files
 typeset entry=""
 while read -r -d '' entry; do

--
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
[email protected]
http://lists.x2go.org/listinfo/x2go-commits

Reply via email to