e8fff60accc04731421a3577b57e0cdde263356e wong Wed Nov 9 15:22:15 2011 -0800 fixed some error print in solo mode with errors diff --git python/lib/ucscgenomics/mkChangeNotes.py python/lib/ucscgenomics/mkChangeNotes.py index fc7cbaa..46d8a38 100644 --- python/lib/ucscgenomics/mkChangeNotes.py +++ python/lib/ucscgenomics/mkChangeNotes.py @@ -470,32 +470,34 @@ errorsDict = {} output = [] for i in errors: line = i.split(":", 1) try: errorsDict[line[0]].append(line[1]) except: errorsDict[line[0]] = [] errorsDict[line[0]].append(line[1]) output.append("Errors (%s):" % len(errors)) for i in sorted(errorsDict.keys()): output.append("%s:" % i) for j in sorted(errorsDict[i]): output.append("%s" % j) output.append("\n") + if missingFiles: output.extend(self.__addMissingToReport(missingFiles, "Files", self.releasePathOld)) output.append("\n") + if self.droppedTables: output.extend(self.__addMissingToReport(self.droppedTables, "Tables")) return output def __init__(self, args): self.releaseNew = args['releaseNew'] self.releaseOld = args['releaseOld'] self.database = args['database'] self.composite = args['composite'] self.loose = args['loose'] self.ignore = args['ignore'] self.summary = args['summary'] self.specialMdb = args['specialMdb'] self.args = args errors = [] @@ -621,16 +623,17 @@ errors.extend(newGbdbError) #set for easy operations totalFiles = set(self.newReleaseFiles) #clean out special fiels we don't push i.e. md5sum.history self.totalFiles = self.__cleanSpecialFiles(totalFiles) #makes list for additional files (self.oldTotalFiles, self.oldSupplementalSet) = (set(), set()) (self.oldReleaseFiles, self.additionalList, self.oldAdditionalList, self.totalFiles) = self.__separateOutAdditional() self.errors = errors if (not errors) or self.ignore: self.output = self.printReportOne(args, c) else: - self.output = self.printErrors(errors, self.missingFiles) + self.droppedTables = set() + self.output = self.printErrors(errors, set())