[X2Go-Commits] [x2gobroker] 10/17: bin/x2gobroker: Correctly use split_host_address() function call.

git-admin at x2go.org git-admin at x2go.org
Fri Dec 14 09:56:12 CET 2018


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

x2go pushed a commit to branch master
in repository x2gobroker.

commit 7103d4a50b25be21521bd97ca7421938c261ff63
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Nov 30 09:35:38 2018 +0100

    bin/x2gobroker: Correctly use split_host_address() function call.
---
 bin/x2gobroker   | 2 +-
 debian/changelog | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/bin/x2gobroker b/bin/x2gobroker
index 16c44df..b67b3a6 100755
--- a/bin/x2gobroker
+++ b/bin/x2gobroker
@@ -256,7 +256,7 @@ if __name__ == "__main__":
                 if not daemon_logdir.endswith('/'):
                     daemon_logdir += '/'
 
-        bind_address, bind_port = x2gobroker.utils.split_host_address(cmdline_args.bind, default_address=None, default_port=8080)
+        bind_address, bind_port = split_host_address(cmdline_args.bind, default_address=None, default_port=8080)
         cmdline_args.bind = "[{address}]:{port}".format(address=bind_address, port=bind_port)
 
     if os.getuid() == 0 and cmdline_args.drop_privileges:
diff --git a/debian/changelog b/debian/changelog
index f37e161..0fcf6d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -85,6 +85,7 @@ x2gobroker (0.0.4.0-0x2go1) UNRELEASED; urgency=medium
       (Fixes: #1315). Thanks to Walid Moghrabi for catching this.
     - SSH broker: Add --login option. This now supports X2Go Broker user and
       X2Go Server username being different accounts.
+    - bin/x2gobroker: Correctly use split_host_address() function call.
   * debian/*:
     + Trigger Makefile's install target and install those files. Drop debhelper
       from-source-installation magic.

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git


More information about the x2go-commits mailing list