Changeset 2936

Timestamp:

Jul 15, 2017 2:31:54 PM (6 years ago)

Author:

toby

Message:

bail out when bin lookup fails

Files:

• branch/2frame/GSASIIpath.py (modified) (1 diff)
• trunk/GSASIIpath.py (modified) (2 diffs)

branch/2frame/GSASIIpath.py

@@ -479 +479 @@
             versions[v] = d
     intVersionsList = sorted(versions.keys())
-    if inpver < min(intVersionsList):
+    if not intVersionsList:
+        print('No binaries located')
+        return
+    elif inpver < min(intVersionsList):
         vsel = min(intVersionsList)
         print('Warning: The current numpy version, {}, is older than\n\tthe oldest dist version, {}'

trunk/GSASIIpath.py

@@ -47 +47 @@
         if var in configDict:
             del configDict[var]
-        if parmdict[var][1] is None: continue
-        if parmdict[var][1] == '': continue
-        if parmdict[var][0] == parmdict[var][1]: continue
-        configDict[var] = parmdict[var][1]
+        if isinstance(parmdict[var],tuple):
+            configDict[var] = parmdict[var]
+        else:
+            if parmdict[var][1] is None: continue
+            if parmdict[var][1] == '': continue
+            if parmdict[var][0] == parmdict[var][1]: continue
+            configDict[var] = parmdict[var][1]
 
 # routines for looking a version numbers in files
@@ -476 +479 @@
             versions[v] = d
     intVersionsList = sorted(versions.keys())
-    if inpver < min(intVersionsList):
+    if not intVersionsList:
+        print('No binaries located')
+        return
+    elif inpver < min(intVersionsList):
         vsel = min(intVersionsList)
         print('Warning: The current numpy version, {}, is older than\n\tthe oldest dist version, {}'