60714310f765f28c36e8e3b8c6c688bdf7937e78 braney Thu Mar 7 16:59:45 2024 -0800 skip hubnames when checking db in custom track against current db diff --git src/hg/lib/customFactory.c src/hg/lib/customFactory.c index 21246de..693439b 100644 --- src/hg/lib/customFactory.c +++ src/hg/lib/customFactory.c @@ -4249,31 +4249,31 @@ { errAbort("Expecting 'track' line, got %s\nline %d of %s", line, lf->lineIx, lf->fileName); } if (!track) continue; lazarusLives(20 * 60); // extend keep-alive time. for big uploads on slow connections. /* verify database for custom track */ char *ctDb = ctGenome(track); if (mustBeCurrentDb) { if (ctDb == NULL) ctDb = genomeDb; - else if (differentString(ctDb, trackHubSkipHubName(genomeDb))) + else if (differentString(trackHubSkipHubName(ctDb), trackHubSkipHubName(genomeDb))) errAbort("can't load %s data into %s custom tracks", ctDb, genomeDb); } struct customTrack *oneList = NULL, *oneTrack; if (track->dbDataLoad) /* Database tracks already mostly loaded, just check that table * still exists (they are removed when not accessed for a while). */ { if (ctConn && !ctDbTableExists(ctConn, track->dbTableName)) continue; if (!ctConn && ctConnErrMsg) track->networkErrMsg = ctConnErrMsg; if ( startsWith("maf", track->tdb->type)) {