b29f234fdad274cd1355b6ccc019bc1bbbc12c2a max Thu Dec 7 05:03:18 2023 -0800 adapting comment, thanks to Chris, refs #32714 diff --git src/hg/hgGeneGraph/hgGeneGraph src/hg/hgGeneGraph/hgGeneGraph index d779579..2b3dc79 100755 --- src/hg/hgGeneGraph/hgGeneGraph +++ src/hg/hgGeneGraph/hgGeneGraph @@ -577,34 +577,39 @@ thick = 3.5 else: thick = 2 return thick def which(binPath): " find full path of binary " import distutils.spawn return distutils.spawn.find_executable(binPath) def findDot(): """ this would never be run on the RR but only on mirrors, because we specify it in hg.conf. It will try to find 'dot' and if it cannot find it, will fall back to cgi-bin/loader/dot_static: - if anything is specified in hg.conf, it will use that - - if it can find "dot" in the PATH, it will use that next (dot - installed from the repos will always work) - if that doesn't work either, we run cgi-bin/loader/dot_static (our - static version may fail due to wrong glibc version) """ + static version may fail due to wrong glibc version) + - if it can find "dot" in the PATH, it will use that next (dot + installed from the repos will always work) - this is for mirrors + + We do not prefer the installed dot because we have different linux versions + or packages on genome-asia, genome-euro and hgwdev and so the dot versions + differ and produce different images and this is confusing when testing. + """ binPath = cfgOption("graphvizPath") if binPath is not None and binPath.strip()!="": return binPath staticPath = join("loader", "dot_static") if isfile(staticPath): return staticPath installedBin = which("dot") if installedBin is None: return None else: sys.stderr.write("Using graphviz binary %s\n" % installedBin) return installedBin