4ab776c4e3131e5ba563e11683a37c9e0c6a45d5 wong Thu Oct 20 14:32:50 2011 -0700 calculates filesize on real file now, follows symlinks diff --git python/programs/mkChangeNotes/mkChangeNotes python/programs/mkChangeNotes/mkChangeNotes index 297a870..ecf599f 100755 --- python/programs/mkChangeNotes/mkChangeNotes +++ python/programs/mkChangeNotes/mkChangeNotes @@ -175,31 +175,33 @@ pass elif re.match('wgEncode.*', i): if oldfiles[i].md5sum != newfiles[i].md5sum: errors.append("file: %s have changed md5sums between releases. %s vs %s" % (i, oldfiles[i].md5sum, newfiles[i].md5sum)) if loose: return list() else: return errors def makeFileSizes(c, args, inlist): checklist = list() for i in inlist: checklist.append("%s/%s" % (c.downloadsDirectory + 'release' + args.releaseNew, i)) filesizes = 0 for i in checklist: - filesizes = filesizes + int(os.path.getsize(i)) + realpath = os.path.realpath(i) + filesizes = filesizes + int(os.path.getsize(realpath)) + filesizes = math.ceil(float(filesizes) / (1024**2)) return int(filesizes) def cleanSpecialFiles(inlist): specialRemoveList = ['md5sum.history'] for i in specialRemoveList: if i in inlist: inlist.remove(i) return(inlist) def separateOutAdditional(oldReleaseFiles, totalFiles, newSupplementalSet, oldSupplementalSet): additionalList = set() oldAdditionalList = set() newTotal = set()