Changeset 686fd10 in sasview for src

Timestamp:

Jul 2, 2015 1:16:33 PM (9 years ago)

Author:

Doucet, Mathieu <doucetm@…>

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:

805f07a

Parents:

3a5f7c8

Message:

Update update url

Location:

src/sas/guiframe

Files:

• config.py (modified) (1 diff)
• gui_manager.py (modified) (1 diff)

src/sas/guiframe/config.py

@@ -10 +10 @@
 __build__ = '1'
 __download_page__ = 'https://github.com/SasView/sasview/releases'
-__update_URL__ = ['raw.githubusercontent.com',
-                  '/SasView/sasview/master/sasview.latestversion']
+__update_URL__ = 'http://www.sasview.org/sasview.latestversion'
 
 

src/sas/guiframe/gui_manager.py

@@ -2043 +2043 @@
         """
         try:
-            req = urllib2.Request('https://github.com/SasView/sasview/releases/latest')
+            req = urllib2.Request(config.__update_URL__)
             res = urllib2.urlopen(req)
-            get_url= res.geturl()
-            content = get_url.partition('/v')[2]
-            logging.info("connected to GitHub. sasview.latestversion = %s"
+            content = res.read().strip()
+            logging.info("Connected to www.sasview.org. Latest version: %s"
                          % (content))
         except:
             msg = traceback.format_exc()
             logging.info(msg)
-            logging.info("failed to connect to GitHub")
+            logging.info("Failed to connect to www.sasview.org")
             content = "0.0.0"