Skip to content

Commit

Permalink
stricter exception type, fix potential error if import fails: cl_time…
Browse files Browse the repository at this point in the history
… was undefined

git-svn-id: https://xpra.org/svn/Xpra/trunk@25072 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jan 24, 2020
1 parent 1dce782 commit da97ff2
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/xpra/client/gtk_base/session_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,11 @@ def make_os_str(sys_platform, platform_release, platform_platform, platform_linu
tb.new_row("Operating System", slabel(LOCAL_PLATFORM_NAME), slabel(SERVER_PLATFORM_NAME))
scaps = self.client.server_capabilities
tb.new_row("Xpra", slabel(XPRA_VERSION), slabel(self.client._remote_version or "unknown"))
cl_rev, cl_ch, cl_date = "unknown", "", ""
try:
from xpra.build_info import BUILD_DATE as cl_date, BUILD_TIME as cl_time
from xpra.src_info import REVISION as cl_rev, LOCAL_MODIFICATIONS as cl_ch #@UnresolvedImport
except:
pass
except ImportError:
cl_rev, cl_ch, cl_date, cl_time = "unknown", "", "", ""
def make_version_str(version):
if version and isinstance(version, (tuple, list)):
version = ".".join(bytestostr(x) for x in version)
Expand Down

0 comments on commit da97ff2

Please sign in to comment.