fix remnants of the old build info format

Xpra-org · Nov 11, 2024 · f12349f · f12349f
1 parent 5f20c7f
commit f12349f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/xpra/gtk/dialogs/session_info.py b/xpra/gtk/dialogs/session_info.py
@@ -199,9 +199,11 @@ def cattr(name):
 
 def get_local_builddate() -> str:
     try:
-        from xpra.build_info import BUILD_DATE, BUILD_TIME
-        return make_datetime(BUILD_DATE, BUILD_TIME)
-    except ImportError:
+        from xpra.build_info import build
+        date = build["date"]
+        time = build["time"]
+        return make_datetime(date, time)
+    except (ImportError, KeyError):
         return ""
 
 

diff --git a/xpra/util/version.py b/xpra/util/version.py
@@ -61,12 +61,12 @@ def full_version_str() -> str:
         if BRANCH == "master":
             rstr += " beta"
     try:
-        from xpra.build_info import BUILD_TYPE
-    except ImportError:
-        pass
-    else:
-        if BUILD_TYPE.lower() == "light":
+        from xpra.build_info import build
+        btype = build["type"]
+        if btype == "light":
             rstr += " (light build)"
+    except (ImportError, KeyError):
+        pass
     return rstr