x2go-commits November 2014

x2go-commits@lists.x2go.org

3 participants
210 discussions

[x2goserver] branch x2goserver-xsettings updated (29b2599 -> c1a809d)
by git-admin＠x2go.org 25 Nov '14

25 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 29b2599 xsettings: rename faulty "base" to "data". new 369cc71 xsettings: try really hard to avoid name clashes by prefixing own shell functions with x2goserver_xsettings_. new c1a809d xsettings: fix speling errors in POSIX BRE character classes. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../extensions/data/x2goserver-xsettings-common.sh | 24 ++++++++++---------- .../post-resume.d/900_xsettings-xsettingsd-refresh | 2 +- .../post-start.d/900_xsettings-xsettingsd-startup | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 2

[x2goserver] branch x2goserver-xsettings updated (7645635 -> 29b2599)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 7645635 extensions: add "data" directory to man page. new d5a5a90 xsettings: split up common functionality (variables, functions) into extensions/base/x2goserver-xsettings-common.sh and reference this file in hooks. new 673538a extensions: add data/common.sh, providing commonly used variables. new 820cefd xsettings: add missing post-resume.d targets to Makefile. new 17588db xsettings: remove faulty directory installed by Makefile from debian/x2goserver-xsettings.install. new 29b2599 xsettings: rename faulty "base" to "data". The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 + debian/x2goserver-xsettings.install | 1 - x2goserver-extensions/Makefile | 2 + .../lib/extensions/data/common.sh | 4 +- x2goserver-xsettings/Makefile | 3 + .../x2goserver-xsettings-common.sh} | 16 +-- .../post-resume.d/900_xsettings-xsettingsd-refresh | 27 +---- .../post-start.d/900_xsettings-xsettingsd-startup | 122 +------------------- .../000_xsettings-xsettingsd-shutdown | 7 +- 9 files changed, 19 insertions(+), 165 deletions(-) copy x2goserver-xsettings/lib/x2go/extensions/pre-terminate.d/000_xsettings-xsettingsd-shutdown => x2goserver-extensions/lib/extensions/data/common.sh (88%) copy x2goserver-xsettings/lib/x2go/extensions/{post-start.d/900_xsettings-xsettingsd-startup => data/x2goserver-xsettings-common.sh} (89%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 5

[x2goserver] branch x2goserver-xsettings updated (9fc1e56 -> 7645635)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 9fc1e56 x2goserver: add x2gopath etc addition to debian/changelog. new bbf8952 x2goserver: add generic typo and whitespace fixes comment to debian/changelog. new 2f134cc extensions: add data directory in hooks directory used for shared data/programs/scripts. new 7645635 extensions: add "data" directory to man page. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 +++ x2goserver-extensions/Makefile | 6 +++++- .../{fail-resume.d => data}/.placeholder | 0 .../man/man8/x2goserver-run-extensions.8 | 11 +++++++++-- 4 files changed, 17 insertions(+), 3 deletions(-) copy x2goserver-extensions/lib/extensions/{fail-resume.d => data}/.placeholder (100%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 3

Build failed in Jenkins: x2goserver+nightly+epel-7 #158
by jenkins＠x2go.org 24 Nov '14

24 Nov '14

See <http://jenkins.x2go.org:8080/job/x2goserver+nightly+epel-7/158/changes> Changes: [ionic] xsession: whitespace and typo fixes. ------------------------------------------ Started by an SCM change Building on master in workspace <http://jenkins.x2go.org:8080/job/x2goserver+nightly+epel-7/ws/> Fetching changes from the remote Git repository Fetching upstream changes from git://code.x2go.org/x2goserver.git Checking out Revision 24529ce22f0a0f04d01026013fd1381f76c75f62 (origin/master) [x2goserver+nightly+epel-7] $ /bin/sh -xe /tmp/hudson4349057022250939102.sh + cd /var/lib/jenkins/bin + SKIP_ARCH=i386 RPM_BUILD_FOR=epel:7 FORCE_BUILD=yes ./x2go-build+upload-rpm-package x2goserver heuler + set_vars x2goserver heuler + TEMP_BASE=/var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/tmp/ + chmod 2770 /var/lib/jenkins/tmp/ + PROJECT_PATH=x2goserver + PROJECT_PATH=x2goserver ++ basename x2goserver + PROJECT=x2goserver ++ echo heuler/ ++ cut -d/ -f1 + ARGV2_COMPONENT=heuler ++ echo heuler/ ++ cut -d/ -f2 + ARGV2_CODENAME= + COMPONENT=heuler + CODENAMES= + '[' -n '' ']' + true ++ date +%Y%m%d + DATE=20141123 + '[' xheuler = xmain ']' + echo baikal + grep heuler + '[' xheuler = xheuler ']' + CHECKOUT=master + '[' x20141123 = xtoday ']' + PROJECT_DIR=/var/lib/jenkins/build/heuler/x2goserver + PKGDIST=/var/lib/jenkins/pkg-dist/heuler/x2goserver + LOCK_FILE=/var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock + mkdir -p /var/lib/jenkins/tmp/ + mkdir -p /var/lib/jenkins/build/heuler/x2goserver + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver + return 0 ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build-rpm-package ']' ++ basename ./x2go-build+upload-rpm-package + '[' xx2go-build+upload-rpm-package = xx2go-build+upload-rpm-package ']' + cd /var/lib/jenkins/build/heuler/x2goserver + pkgneedsbuild master + CHECKOUT=master + '[' -d .git ']' ++ date +%s + TIMESTAMP=1416714063 ++ git branch ++ grep '*' ++ awk '{print $2}' + CURRENT_BRANCH=tmp-1416714062 + git checkout master + git checkout -b tmp-1416714063 + LANG=en_US.UTF-8 + git pull origin master + egrep '^Already up-to-date.$' + git checkout tmp-1416714062 + git branch -D tmp-1416714063 + exit 0 + '[' xyes = xyes ']' + '[' xno '!=' xyes ']' + delay_build + sleep 60s + lock_workspace + wait_for_lock + '[' -f /var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock ']' + echo 6914 + prepare_workspace + '[' -d /var/lib/jenkins/build/heuler/x2goserver/.git ']' + cd /var/lib/jenkins/build/heuler/x2goserver + git reset --hard HEAD is now at 24529ce xsession: whitespace and typo fixes. + git checkout --force master Already on 'master' Your branch is ahead of 'origin/master' by 174 commits. + git pull origin master >From git://code.x2go.org/x2goserver * branch master -> FETCH_HEAD Already up-to-date. + git fetch origin upstream:upstream fatal: Couldn't find remote ref upstream + true + git fetch origin pristine-tar:pristine-tar fatal: Couldn't find remote ref pristine-tar + true + git reset --hard HEAD is now at 24529ce xsession: whitespace and typo fixes. + git clean -df ++ git show-ref -s heads/master + GIT_OBJECT_ID=24529ce22f0a0f04d01026013fd1381f76c75f62 + cd /var/lib/jenkins/build/heuler/x2goserver + '[' x '!=' x ']' + return 0 + unlock_workspace + rm -f /var/lib/jenkins/build/heuler/x2goserver/../.x2goserver.lock + clear_pkgdist + echo epel:7 + sed -e 's/ /\n/g' + read line ++ echo epel:7 ++ cut -d: -f1 ++ tr '[:upper:]' '[:lower:]' + l_DIST=epel ++ echo epel:7 ++ cut -d: -f2- ++ sed -e 's/,/ /g' ++ tr '[:upper:]' '[:lower:]' + l_CODENAMES=7 + echo 'fedora epel opensuse sles' + grep epel + for l_CODENAME in '$l_CODENAMES' + test -z + for l_ARCH in x86_64 i386 + '[' xi386 '!=' xx86_64 ']' + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64 + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/rpmbuild/SOURCES/*' + rm -f '/var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/rpmbuild/SRPMS/x2goserver-*.src.rpm' + rm -f /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/perl-X2Go-Log-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/perl-X2Go-Server-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/perl-X2Go-Server-DB-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.src.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-common-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-debuginfo-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-extensions-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-fmbindings-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-printing-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/x2goserver-xsession-4.1.0.0-0.0x2go1.0.git20141122.1192.heuler.el7.centos.x86_64.rpm + for l_ARCH in x86_64 i386 + '[' xi386 '!=' xi386 ']' + read line + return 0 + build_packages + echo epel:7 + sed -e 's/ /\n/g' + read line ++ echo epel:7 ++ cut -d: -f1 ++ tr '[:upper:]' '[:lower:]' + l_DIST=epel ++ echo epel:7 ++ cut -d: -f2- ++ sed -e 's/,/ /g' ++ tr '[:upper:]' '[:lower:]' + l_CODENAMES=7 + echo 'fedora epel opensuse sles' + grep epel + for l_CODENAME in '$l_CODENAMES' + test -z + mkdir -p /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES ++ mktemp -d --tmpdir=/var/lib/jenkins/tmp/ + TEMP_DIR=/var/lib/jenkins/tmp/tmp.TKOhmZXR1L + mkdir -p /var/lib/jenkins/tmp/tmp.TKOhmZXR1L/x2goserver + chmod 2770 /var/lib/jenkins/tmp/tmp.TKOhmZXR1L -Rf + cd /var/lib/jenkins/build/heuler/x2goserver + git clone /var/lib/jenkins/build/heuler/x2goserver /var/lib/jenkins/tmp/tmp.TKOhmZXR1L/x2goserver/ Cloning into '/var/lib/jenkins/tmp/tmp.TKOhmZXR1L/x2goserver'... done. + cd /var/lib/jenkins/tmp/tmp.TKOhmZXR1L ++ cd x2goserver ++ gitrevno ++ cd - + GITREV=1193 + cd x2goserver + git --no-pager log --since '2 years ago' '--format=%ai %aN (%h) %n%n%x09*%w(68,0,10) %s%d%n' + cd - + rm -Rf x2goserver/.git + mv x2goserver/x2goserver.spec . ++ cat x2goserver.spec ++ egrep '^Version:.*' ++ awk '{ print $2 }' + UPSTREAM_VERSION=4.1.0.0 ++ cat x2goserver.spec ++ egrep '^Release:.*' ++ awk '{ print $2 }' + PKG_RELEASE='0.0x2go1%{?dist}' ++ sed -e 's/%{?dist}//' ++ echo '0.0x2go1%{?dist}' + PKG_SRCRELEASE=0.0x2go1 ++ cat x2goserver.spec ++ egrep '^BuildArch:.*noarch$' ++ echo no + IS_NOARCH=no + '[' heuler = heuler ']' + IS_RELEASE=0 + sed -i x2goserver.spec -e 's/%{?dist}/.0.git20141123.1193.heuler%{?dist}/' + '[' -f x2goserver/debian/patches/series ']' + cat x2goserver.spec + egrep '^Source[1-9]+:.*' + sed 's/%{name}/x2goserver/' + awk '{ print $2 }' + read source_file + find x2goserver/rpm/x2goserver.service -maxdepth 0 find: `x2goserver/rpm/x2goserver.service': No such file or directory + find x2goserver/x2goserver.service -maxdepth 0 + cp x2goserver/x2goserver.service /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/ + read source_file + find x2goserver/rpm/x2goserver.init -maxdepth 0 + cp x2goserver/rpm/x2goserver.init /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/ + continue + read source_file + find x2goserver/rpm/x2goserver-rpmlintrc -maxdepth 0 + cp x2goserver/rpm/x2goserver-rpmlintrc /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/ + continue + read source_file + mv /var/lib/jenkins/tmp/tmp.TKOhmZXR1L/x2goserver /var/lib/jenkins/tmp/tmp.TKOhmZXR1L/x2goserver-4.1.0.0 + tar -czf /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/x2goserver-4.1.0.0.tar.gz x2goserver-4.1.0.0 + cp x2goserver.spec /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES + '[' xepel = xfedora ']' + '[' xepel = xepel ']' + '[' -d /var/lib/mock/epel-7-x86_64 ']' + rm -f /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/x86_64/build.log + mock --buildsrpm -r epel-7-x86_64 --result /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/rpmbuild/SRPMS --spec /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/x2goserver.spec --sources /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7//rpmbuild/SOURCES/ INFO: mock.py version 1.1.33 starting... Start: init plugins INFO: selinux disabled Finish: init plugins Start: run INFO: Start(x2goserver.spec) Config(epel-7-x86_64) Start: lock buildroot Start: clean chroot Finish: clean chroot Finish: lock buildroot Start: chroot init Start: lock buildroot Mock Version: 1.1.33 INFO: Mock Version: 1.1.33 INFO: calling preinit hooks INFO: enabled root cache Start: unpacking root cache Finish: unpacking root cache INFO: enabled yum cache Start: cleaning yum metadata Finish: cleaning yum metadata INFO: enabled ccache Start: device setup Finish: device setup Start: yum update Start: Outputting list of available packages ERROR: Exception(x2goserver.spec) Config(epel-7-x86_64) 0 minutes 30 seconds INFO: Results and/or logs in: /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/rpmbuild/SRPMS INFO: Cleaning up build root ('clean_on_failure=True') Start: lock buildroot Start: clean chroot INFO: chroot (/var/lib/mock/epel-7-x86_64) unlocked and deleted Finish: clean chroot Finish: lock buildroot ERROR: Command failed. See logs for output. # /usr/bin/repoquery -c /var/lib/mock/epel-7-x86_64/root//etc/yum.conf -a --qf '%{nevra} %{buildtime} %{size} %{pkgid} %{repoid}' > /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/rpmbuild/SRPMS/available_pkgs + cat /var/lib/jenkins/pkg-dist/heuler/x2goserver/epel/7/rpmbuild/SRPMS/build.log Mock Version: 1.1.33 + rm -Rf /var/lib/jenkins/tmp/tmp.TKOhmZXR1L + exit -1 Build step 'Execute shell' marked build as failure

1 1

[x2goserver] branch x2goserver-xsettings updated (3907f89 -> 9fc1e56)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 3907f89 xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. new 4591fb2 extensions: whitespace, typo fixes and documentation update. new 9fc1e56 x2goserver: add x2gopath etc addition to debian/changelog. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ x2goserver-extensions/README.md | 10 ++++---- .../man/man8/x2goserver-run-extensions.8 | 27 ++++++++++++-------- 3 files changed, 23 insertions(+), 16 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 2

[x2goserver] branch master updated (24529ce -> 21dfff1)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goserver. from 24529ce xsession: whitespace and typo fixes. new 21dfff1 extensions: whitespace, typo fixes and documentation update. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2goserver-extensions/README.md | 10 ++++---- .../man/man8/x2goserver-run-extensions.8 | 27 ++++++++++++-------- 2 files changed, 21 insertions(+), 16 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 1

[x2goserver] branch x2goserver-xsettings updated (59fce39 -> 3907f89)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 59fce39 xsettings: add debian/x2goserver-xsettings.manpages. new 3907f89 xsettings: add post-resume hook. source line must still be fixed to access shared shell code. TBD. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../post-resume.d/900_xsettings-xsettingsd-refresh | 50 ++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 x2goserver-xsettings/lib/x2go/extensions/post-resume.d/900_xsettings-xsettingsd-refresh -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 1

[x2goserver] branch x2goserver-xsettings updated (867ba19 -> 59fce39)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 867ba19 xsettings: documentation update, describe the newly implemented features. new f87cb1b xsettings: change RPM spec file to include the new x2goserver-xsettings package. new fc5d6fb xsettings: spell XSETTINGS in uppercase in RPM spec file. new 8a8a579 xsettings: add x2goserver-xsettings package to debian/control. new 20e4e74 xsettings: add debian/changelog entries to reflect x2goserver-xsettings addition. new 47ab31e xsettings: add debian/x2goserver-xsettings.dirs. new 17078ab xsettings: add debian/x2goserver-xsettings.install. new 59fce39 xsettings: add debian/x2goserver-xsettings.manpages. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 14 ++++++++++ debian/control | 20 ++++++++++++++ ...ver-xsession.dirs => x2goserver-xsettings.dirs} | 1 + debian/x2goserver-xsettings.install | 4 +++ debian/x2goserver-xsettings.manpages | 1 + x2goserver.spec | 28 ++++++++++++++++++++ 6 files changed, 68 insertions(+) copy debian/{x2goserver-xsession.dirs => x2goserver-xsettings.dirs} (78%) create mode 100644 debian/x2goserver-xsettings.install create mode 100644 debian/x2goserver-xsettings.manpages -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 7

[x2goserver] branch x2goserver-xsettings updated (d7f158f -> 867ba19)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from d7f158f xsettings: use merge shell function to merge the determined base config with the overrides config. new 695dd9a xsettings: remove .conf suffix from xsettingsd config files. new 58299e4 xsettings: add comment explaining the merge shell function and its requirements. new 706b527 xsettings: create XSETTINGSD_OVERRIDES_CONF if missing. new ae85e6c xsettings: rename xsettings.conf previously missed. new 867ba19 xsettings: documentation update, describe the newly implemented features. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: x2goserver-xsettings/Makefile | 4 +-- x2goserver-xsettings/README.md | 2 +- .../etc/{xsettings.conf => xsettings} | 0 .../post-start.d/900_xsettings-xsettingsd-startup | 23 +++++++++--- .../man/man8/x2goserver-xsettings.8.in | 38 +++++++++++++++----- 5 files changed, 52 insertions(+), 15 deletions(-) rename x2goserver-xsettings/etc/{xsettings.conf => xsettings} (100%) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 5

[x2goserver] branch x2goserver-xsettings updated (7c1101f -> d7f158f)
by git-admin＠x2go.org 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch x2goserver-xsettings in repository x2goserver. from 7c1101f xsettings: filter out overriden keys. Add the rest to the second temporary file. new 3f9cc52 xsettings: use out file directly, no need for a second temp file. new c0ee653 xsettings: rename XSETTINGSD_USER_CONF to XSETTINGSD_REMOTE_CONF. new 5ff6462 xsettings: add XSETTINGSD_OVERRIDES_CONF for the user-provided config overriding arbitrary settings and XSETTINGSD_CONF as the file eventually to be used by xsettingsd. new 6f40c24 xsettings: set XSETTINGSD_BASE_CONF to either the remote config to be pushed to the settings dir by a generic client or, if that is not available, the shipped global config in SYSCONFDIR. new d7f158f xsettings: use merge shell function to merge the determined base config with the overrides config. The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: .../post-start.d/900_xsettings-xsettingsd-startup | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git

1 5

← Newer
1
2
3
4
5
6
7
...
21
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits November 2014