[X2Go-Commits] [x2goserver] 20/50: xsettings: filter out overriden keys. Add the rest to the second temporary file.
git-admin at x2go.org
git-admin at x2go.org
Tue Mar 3 16:07:18 CET 2015
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch feature/x2goserver-xsettings
in repository x2goserver.
commit 95737dc0dbc0f5f7602d9c0a3d081fdff19f66ac
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Nov 24 01:05:55 2014 +0100
xsettings: filter out overriden keys. Add the rest to the second temporary file.
---
.../post-start.d/900_xsettings-xsettingsd-startup | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
index 5649a31..366d112 100644
--- a/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
+++ b/x2goserver-xsettings/lib/x2go/extensions/post-start.d/900_xsettings-xsettingsd-startup
@@ -99,6 +99,13 @@ merge() {
value="$(extract_value "${parsed_line}")"
[ -z "${key}" ] && continue
[ -z "${value}" ] && continue
+
+ # Filter out keys already defined in the parsed overrides file.
+ while read overrides_key; do
+ [ -n "${overrides_key}" ] && [ "${key}" = "${overrides_key}" ] && continue 2
+ done < "${TMP_KEY}"
+
+ echo "${key} ${value}" >> "${TMP_KEYVALUE}"
done < "${BASE_FILE}"
}
--
Alioth's /srv/git/code.x2go.org/x2goserver.git//../..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git
More information about the x2go-commits
mailing list