[X2Go-Commits] x2gobroker.git - build-main (branch) updated: 0.0.0.5-4-gc671ef9
X2Go dev team
git-admin at x2go.org
Sun May 19 13:03:18 CEST 2013
The branch, build-main has been updated
via c671ef9817d26b7a8cf0350558dd6887f9ad1787 (commit)
from ef381eb4cb55fbdfb842f5f9fdcf9037e3f8caa6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
-----------------------------------------------------------------------
Summary of changes:
debian/x2gobroker-agent.postinst | 16 ++++++++--------
debian/x2gobroker-agent.postrm | 10 +++++-----
debian/x2gobroker-daemon.postinst | 18 ++++++++----------
debian/x2gobroker-daemon.postrm | 10 +++++-----
4 files changed, 26 insertions(+), 28 deletions(-)
The diff of changes is:
diff --git a/debian/x2gobroker-agent.postinst b/debian/x2gobroker-agent.postinst
index 3f7c1ed..a9c761b 100755
--- a/debian/x2gobroker-agent.postinst
+++ b/debian/x2gobroker-agent.postinst
@@ -25,19 +25,19 @@ case "$1" in
configure)
# setup user/group x2gobroker
- if ! getent group x2gobroker >/dev/null; then
- echo "Creating x2gobroker group." >&2
+ if ! getent group x2gobroker 1>/dev/null; then
+ echo "Creating x2gobroker group." 1>&2
addgroup --system x2gobroker
else
- echo "Group x2gobroker already exists." >&2
+ echo "Group x2gobroker already exists." 1>&2
fi
- if ! getent passwd x2gobroker >/dev/null; then
- echo "Creating x2gobroker user." >&2
+ if ! getent passwd x2gobroker 1>/dev/null; then
+ echo "Creating x2gobroker user." 1>&2
adduser --system \
--disabled-password --disabled-login \
--shell /bin/bash --group --home /var/lib/x2gobroker x2gobroker
else
- echo "User x2gobroker already exists." >&2
+ echo "User x2gobroker already exists." 1>&2
# make sure all settings are appropriate
if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
mkdir -p /var/lib/x2gobroker
@@ -51,7 +51,7 @@ case "$1" in
fi
# the x2gobroker-agent has to be installed setuid root
- if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then
+ if ! dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then
dpkg-statoverride --add --update root x2gobroker 4750 /usr/lib/x2go/x2gobroker-agent
fi
@@ -61,7 +61,7 @@ case "$1" in
;;
*)
- echo "postinst called with unknown argument \`$1'" >&2
+ echo "postinst called with unknown argument \`$1'" 1>&2
exit 1
;;
esac
diff --git a/debian/x2gobroker-agent.postrm b/debian/x2gobroker-agent.postrm
index a9dc429..bc535ee 100755
--- a/debian/x2gobroker-agent.postrm
+++ b/debian/x2gobroker-agent.postrm
@@ -18,15 +18,15 @@ set -e
case "$1" in
purge)
- if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent >/dev/null; then
+ if dpkg-statoverride --list /usr/lib/x2go/x2gobroker-agent 1>/dev/null; then
dpkg-statoverride --remove /usr/lib/x2go/x2gobroker-agent
fi
if [ ! -d /usr/share/doc/x2gobroker-daemon ]; then
# remove user/group x2gobroker from system (if not in use by x2gobroker-daemon
- getent passwd x2gobroker >/dev/null && deluser x2gobroker
- getent group x2gobroker >/dev/null && delgroup x2gobroker
- getent group x2gobroker >/dev/null && delgroup x2gobroker
+ getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
rm -Rfv /var/lib/x2gobroker
fi
@@ -34,7 +34,7 @@ case "$1" in
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
- echo "postrm called with unknown argument \`$1'" >&2
+ echo "postrm called with unknown argument \`$1'" 1>&2
exit 0
;;
esac
diff --git a/debian/x2gobroker-daemon.postinst b/debian/x2gobroker-daemon.postinst
index b37c2f5..d89a488 100755
--- a/debian/x2gobroker-daemon.postinst
+++ b/debian/x2gobroker-daemon.postinst
@@ -25,19 +25,19 @@ case "$1" in
configure)
# setup user/group x2gobroker
- if ! getent group x2gobroker >/dev/null; then
- echo "Creating x2gobroker group." >&2
+ if ! getent group x2gobroker 1>/dev/null; then
+ echo "Creating x2gobroker group." 1>&2
addgroup --system x2gobroker
else
- echo "Group x2gobroker already exists." >&2
+ echo "Group x2gobroker already exists." 1>&2
fi
- if ! getent passwd x2gobroker >/dev/null; then
- echo "Creating x2gobroker user." >&2
+ if ! getent passwd x2gobroker 1>/dev/null; then
+ echo "Creating x2gobroker user." 1>&2
adduser --system \
--disabled-password --disabled-login \
--shell /bin/bash --group --home /var/lib/x2go x2gobroker
else
- echo "User x2gobroker already exists." >&2
+ echo "User x2gobroker already exists." 1>&2
# make sure all settings are appropriate
if getent passwd x2gobroker | grep /dev/null 1>/dev/null 2>/dev/null; then
mkdir -p /var/lib/x2gobroker
@@ -51,7 +51,7 @@ case "$1" in
fi
# the x2gobroker-daemon needs special permissions on its log directory
- if ! dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+ if ! dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --add --update x2gobroker adm 2750 /var/log/x2gobroker
fi
@@ -61,7 +61,7 @@ case "$1" in
;;
*)
- echo "postinst called with unknown argument \`$1'" >&2
+ echo "postinst called with unknown argument \`$1'" 1>&2
exit 1
;;
esac
@@ -72,5 +72,3 @@ esac
#DEBHELPER#
exit 0
-
-
diff --git a/debian/x2gobroker-daemon.postrm b/debian/x2gobroker-daemon.postrm
index 42f3752..34a8687 100755
--- a/debian/x2gobroker-daemon.postrm
+++ b/debian/x2gobroker-daemon.postrm
@@ -19,15 +19,15 @@ set -e
case "$1" in
purge)
- if dpkg-statoverride --list /var/log/x2gobroker >/dev/null; then
+ if dpkg-statoverride --list /var/log/x2gobroker 1>/dev/null; then
dpkg-statoverride --remove /var/log/x2gobroker
fi
if [ ! -d /usr/share/doc/x2gobroker-agent ]; then
# remove user/group x2gobroker from system (only if not in use by x2gobroker-agent
- getent passwd x2gobroker >/dev/null && deluser x2gobroker
- getent group x2gobroker >/dev/null && delgroup x2gobroker
- getent group x2gobroker >/dev/null && delgroup x2gobroker
+ getent passwd x2gobroker 1>/dev/null && deluser x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
+ getent group x2gobroker 1>/dev/null && delgroup x2gobroker
rm -Rf /var/lib/x2gobroker
fi
@@ -35,7 +35,7 @@ case "$1" in
remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
;;
*)
- echo "postrm called with unknown argument \`$1'" >&2
+ echo "postrm called with unknown argument \`$1'" 1>&2
exit 0
;;
esac
hooks/post-receive
--
x2gobroker.git (HTTP(S) Session broker for X2Go)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2gobroker.git" (HTTP(S) Session broker for X2Go).
More information about the x2go-commits
mailing list