Skip to content

Commit 27c8877

Browse files
committed
update path-hack/warning code for binaries
1 parent eb1f4d5 commit 27c8877

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

GSASII/GSASIIdataGUI.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,18 @@ def ShowVersions():
496496
result = dlg.ShowModal()
497497
finally:
498498
dlg.Destroy()
499-
if result != wx.ID_NO:
500-
try:
501-
GSASIIpath.InstallGitBinary(binarydir, installLoc,
499+
if result != wx.ID_NO:
500+
try:
501+
GSASIIpath.InstallGitBinary(binarydir, installLoc,
502502
nameByVersion=True)
503-
msg = f'Binaries installed from {binarydir} to {installLoc}\n'
504-
print(msg)
505-
GSASIIpath.BinaryPathFailed = False
506-
GSASIIpath.SetBinaryPath(True)
507-
except:
508-
print('Download failed, sorry')
509-
if not GSASIIpath.pathhack_TestSPG(GSASIIpath.binaryPath):
510-
versionDict['errors'] += 'Error accessing GSAS-II binary files. Only limited functionality available.'
503+
msg = f'Binaries installed from {binarydir} to {installLoc}\n'
504+
print(msg)
505+
GSASIIpath.BinaryPathFailed = False
506+
GSASIIpath.SetBinaryPath(True)
507+
except:
508+
print('Download failed, sorry')
509+
if not GSASIIpath.pathhack_TestSPG(GSASIIpath.binaryPath):
510+
versionDict['errors'] += 'Error accessing GSAS-II binary files. Only limited functionality available.'
511511
else:
512512
if GSASIIpath.binaryPath:
513513
prog = os.path.join(GSASIIpath.binaryPath,"convcell")
@@ -516,14 +516,14 @@ def ShowVersions():
516516
if sys.platform.startswith('win'):
517517
prog += '.exe'
518518
if not shutil.which(prog):
519-
versionDict['errors'] += 'Installed binary files need an update. If you built them, rerun scons'
519+
versionDict['errors'] += 'NIST*LATTICE binaries not found. You may have old binaries or an installation problem. If you built them built binaries, rerun scons or meson'
520520
if warn:
521521
print(70*'=')
522522
print('''You are running GSAS-II in a Python environment with either untested
523523
or known to be problematic packages, as noted above. If you are seeing
524524
problems in running GSAS-II you are suggested to install an additional
525525
copy of GSAS-II from one of the gsas2full installers (see
526-
https://bit.ly/G2install). This will provide a working Python
526+
https://GSASII.github.io/). This will provide a working Python
527527
environment as well as the latest GSAS-II version.
528528
529529
For information on GSAS-II package requirements see

0 commit comments

Comments
 (0)