Changeset 24386b9 in sasview for src/sas

Timestamp:

Jul 15, 2015 1:19:40 PM (9 years ago)

Author:

mathieu

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

069aae2

Parents:

9df6a03

Message:

Update version checking

File:

• src/sas/guiframe/gui_manager.py (modified) (2 diffs)

src/sas/guiframe/gui_manager.py

@@ -2048 +2048 @@
             logging.info("Connected to www.sasview.org. Latest version: %s"
                          % (content))
+            version_info = json.loads(content)
         except:
             msg = traceback.format_exc()
             logging.info(msg)
             logging.info("Failed to connect to www.sasview.org")
-            content = "0.0.0"
-
-        version_info = json.loads(content)
+            version_info = {"version": "0.0.0"}
         self._process_version(version_info, standalone=event == None)
 
@@ -2069 +2068 @@
 
         """
-        version = version_info["version"]
         try:
+            version = version_info["version"]
             if version == "0.0.0":
                 msg = "Could not connect to the application server."