8bf2aee6afed987f1a921d3f4d68b06f1a49aa22 max Mon Oct 6 04:42:03 2014 -0700 fixing gbib error on assembly hubs, refs #11957 diff --git src/hg/lib/hdb.c src/hg/lib/hdb.c index 14dd2b1..e704bf0 100644 --- src/hg/lib/hdb.c +++ src/hg/lib/hdb.c @@ -950,31 +950,31 @@ safecpy(trackName, HDB_MAX_TABLE_STRING, ptr+1); } } } int hChromSize(char *db, char *chromName) /* Return size of chromosome. */ { struct chromInfo *ci = mustGetChromInfo(db, chromName); return ci->size; } void hNibForChrom(char *db, char *chromName, char retNibName[HDB_MAX_PATH_STRING]) /* Get .nib file associated with chromosome. */ { -if (cfgOptionBooleanDefault("forceTwoBit", FALSE) == TRUE) +if (cfgOptionBooleanDefault("forceTwoBit", FALSE) == TRUE && !trackHubDatabase(db)) { char buf[HDB_MAX_PATH_STRING]; safef(buf, HDB_MAX_PATH_STRING, "/gbdb/%s/%s.2bit", db, db); char *newPath = hReplaceGbdb(buf); safecpy(retNibName, HDB_MAX_PATH_STRING, newPath); freeMem(newPath); return; } if (hDbIsActive(db)) { struct chromInfo *ci = mustGetChromInfo(db, chromName); safef(retNibName, HDB_MAX_PATH_STRING, "%s", ci->fileName); } else