af12270c6f6e41641b2b6376889faccfeeea3127 wong Thu Oct 20 15:47:53 2011 -0700 added back in null fizesize counts diff --git python/programs/mkChangeNotes/mkChangeNotes python/programs/mkChangeNotes/mkChangeNotes index 3706b28..724f452 100755 --- python/programs/mkChangeNotes/mkChangeNotes +++ python/programs/mkChangeNotes/mkChangeNotes @@ -254,56 +254,55 @@ print "Other: %d" % int(len(additionalList)) print "\n" totalsize = 0 size = 0 print "Sizes of New:" tableGb = int(tableSize/1024) if tableGb > 1: print "Tables: %d MB (%d GB)" % (tableSize, tableGb) elif tableSize: print "Tables: %d MB" % tableSize totalsize = totalsize + tableSize size = int(makeFileSizes(c, args, pushFiles)) totalsize = totalsize + size if int(size/1024) > 1: print "Files: %d MB (%d GB)" % (size, int(size/1024)) - elif size: + else: print "Files: %d MB" % size size = int(makeFileSizes(c, args, pushGbdbs)) totalsize = totalsize + size if int(size/1024) > 1: print "Gbdbs: %d MB (%d GB)" % (size, int(size/1024)) - elif size: + else: print "Gbdbs: %d MB" % size size = int(makeFileSizes(c, args, (newSupplementalSet - oldSupplementalSet))) totalsize = totalsize + size if int(size/1024) > 1: print "Supplemental: %d MB (%d GB)" % (size, int(size/1024)) - elif size: + else: print "Supplemental: %d MB" % size size = int(makeFileSizes(c, args, (additionalList))) totalsize = totalsize + size if int(size/1024) > 1: print "Other: %d MB (%d GB)" % (size, int(size/1024)) - elif size: + else: print "Other: %d MB" % size if int(totalsize/1024) > 1: print "Total: %d MB (%d GB)" % (totalsize, int(totalsize/1024)) - elif totalsize: - print "Total: %d MB" % totalsize else: - print "No files to push" + print "Total: %d MB" % totalsize + tableprint = len(newTableSet | oldTableSet | revokedTableSet) if tableprint: print "\n" print "TABLES:" print "New: %s" % len(pushTables) print "Untouched: %s" % len(oldTableSet & newTableSet) print "Revoked/Replaced/Renamed: %s" % len(revokedTableSet) print "New + Untouched: %s" % len(newTableSet) print "Total (New + Untouched + Revoked/Replaced/Renamed): %s" % len(newTableSet | oldTableSet | revokedTableSet) if tableprint and not args.summary: print "" print "New Tables (%s):" % len(pushTables) printIter(pushTables) print "" print "Untouched (%s):" % len(oldTableSet & newTableSet)