xpra icon
Bug tracker and wiki

This bug tracker and wiki are being discontinued
please use https://github.com/Xpra-org/xpra instead.


Ticket #575: 0001-fix-error-in-hello-message-linked-to-build.version-a.patch

File 0001-fix-error-in-hello-message-linked-to-build.version-a.patch, 3.7 KB (added by Benoit Gschwind, 7 years ago)

patch that resolve the issue

  • src/xpra/client/client_base.py

    From 533916bb43ee5aad8adec4f12b801c008d66bf8f Mon Sep 17 00:00:00 2001
    From: Benoit Gschwind <gschwind@gnu-log.net>
    Date: Fri, 23 May 2014 00:49:20 +0200
    Subject: [PATCH] fix error in hello message linked to build.version and
     version attribute
    
     The build.version was not properly generated and check in several code
     places.
    ---
     src/xpra/client/client_base.py    | 1 +
     src/xpra/client/ui_client_base.py | 1 +
     src/xpra/server/server_base.py    | 2 +-
     src/xpra/server/source.py         | 1 +
     src/xpra/version_util.py          | 5 ++---
     5 files changed, 6 insertions(+), 4 deletions(-)
    
    diff --git a/src/xpra/client/client_base.py b/src/xpra/client/client_base.py
    index c536300..da3b9e4 100644
    a b class XpraClientBase(object): 
    447447        self._remote_machine_id = c.strget("machine_id")
    448448        self._remote_uuid = c.strget("uuid")
    449449        self._remote_version = c.strget("version")
     450        self._remote_version = c.strget("build.version", self._remote_version)
    450451        self._remote_revision = c.strget("revision")
    451452        self._remote_revision = c.strget("build.revision", self._remote_revision)
    452453        self._remote_platform = c.strget("platform")
  • src/xpra/client/ui_client_base.py

    diff --git a/src/xpra/client/ui_client_base.py b/src/xpra/client/ui_client_base.py
    index 99495db..1deea94 100644
    a b class UIXpraClient(XpraClientBase): 
    12131213            proxy_platform = c.strget("proxy.platform")
    12141214            proxy_release = c.strget("proxy.platform.release")
    12151215            proxy_version = c.strget("proxy.version")
     1216            proxy_version = c.strget("proxy.build.version", proxy_version)
    12161217            msg = "via: %s proxy version %s" % (platform_name(proxy_platform, proxy_release), std(proxy_version))
    12171218            if proxy_hostname:
    12181219                msg += " on '%s'" % std(proxy_hostname)
  • src/xpra/server/server_base.py

    diff --git a/src/xpra/server/server_base.py b/src/xpra/server/server_base.py
    index 418537e..2799f9a 100644
    a b class ServerBase(ServerCore): 
    629629             "sound.server_driven"          : True,
    630630             "server_type"                  : "base",
    631631             })
    632         capabilities.update(get_version_info("build."))
     632        capabilities.update(get_version_info("build"))
    633633        for k,v in codec_versions.items():
    634634            capabilities["encoding.%s.version" % k] = v
    635635        return capabilities
  • src/xpra/server/source.py

    diff --git a/src/xpra/server/source.py b/src/xpra/server/source.py
    index a62eda6..c6609c9 100644
    a b class ServerSource(object): 
    560560            proxy_platform = c.strget("proxy.platform")
    561561            proxy_release = c.strget("proxy.platform.release")
    562562            proxy_version = c.strget("proxy.version")
     563            proxy_version = c.strget("proxy.build.version", proxy_version)
    563564            msg = "via %s proxy version %s" % (platform_name(proxy_platform, proxy_release), std(proxy_version))
    564565            if proxy_hostname:
    565566                msg += " on '%s'" % std(proxy_hostname)
  • src/xpra/version_util.py

    diff --git a/src/xpra/version_util.py b/src/xpra/version_util.py
    index d3b5205..07dd59e 100644
    a b def get_host_info(prefix=""): 
    6969    return info
    7070
    7171def get_version_info(prefix=""):
    72     props = {
    73              prefix+"version" : local_version
    74              }
     72    props = { }
     73    props[mk(prefix, "version")] = local_version
    7574    try:
    7675        from xpra.src_info import LOCAL_MODIFICATIONS, REVISION
    7776        from xpra.build_info import BUILD_DATE, BUILT_BY, BUILT_ON, BUILD_BIT, BUILD_CPU, \