2f20300fca8dc0d0a69882babd8d92ad3cc01f14
wong
  Fri Apr 20 10:58:27 2012 -0700
added a check to remove old revoked files from the old fileset
diff --git python/lib/ucscgenomics/mkChangeNotes.py python/lib/ucscgenomics/mkChangeNotes.py
index 425abc8..7087460 100644
--- python/lib/ucscgenomics/mkChangeNotes.py
+++ python/lib/ucscgenomics/mkChangeNotes.py
@@ -49,31 +49,31 @@
                 continue
             errors.append("%s: %s missing from %s" % (type, i, status))
         return errors
 
     def __checkFilesForDropped(self):
         diff = set(self.oldReleaseFiles) - set(self.newReleaseFiles)
         return diff
 
     def checkTableStatus(self, status, state):
         errors=[]
         revokedset = set()
         (database, composite, loose) = (self.database, self.composite, self.loose)
         if state == 'new':
             (mdb, files, revokedset) = (self.newMdb, self.newReleaseFiles, self.revokedSet)
         elif state == 'old':
-            (mdb, files) = (self.oldMdb, self.oldReleaseFiles)
+            (mdb, files, revokedset) = (self.oldMdb, self.oldReleaseFiles, self.oldRevokedSet)
 
 ### If MySQLdb ever gets installed ###
 
         #home = os.environ['HOME']
         #dbhost = ''
         #dbuser = ''
         #dbpassword = ''
         #p = re.compile('db.(\S+)=(\S+)')
         #with open("%s/.hg.conf" % home) as f:
         #    for line in f:
         #        line.rstrip("\n\r")
         #        if p.match(line):
         #            m = p.match(line)
         #            if m.groups(1)[0] == 'host':
         #                dbhost = m.groups(1)[1]
@@ -565,31 +565,31 @@
             self.oldMdb = c.publicMetaDb
      
            
             if self.verbose >= 2:
                 sys.stderr.write("Checking for missing files\n")
             #make a list of missing files
             self.missingFiles = self.__checkFilesForDropped()
             #filter them out of old release files
 
 
 
             if self.verbose >= 1:
                 sys.stderr.write("Scanning and parsing release directories\n")
             #check if all files listed in release directories have associated metaDb entries
             (self.newMdb, self.revokedSet, self.revokedFiles, self.atticSet, self.newSupplementalSet, newFileErrors) = self.checkMetaDbForFiles("alpha metaDb", "new")
-            (self.oldMdb, spam, eggs, self.oldAtticSet, self.oldSupplementalSet, oldFileErrors) = self.checkMetaDbForFiles("public metaDb", "old")
+            (self.oldMdb, self.oldRevokedSet, self.oldRevokedFiles, self.oldAtticSet, self.oldSupplementalSet, oldFileErrors) = self.checkMetaDbForFiles("public metaDb", "old")
 
             self.expIds = set(self.newMdb.filter(lambda s: 'expId' in s, lambda s: s['expId']))
 
             if self.verbose >= 2:
                 sys.stderr.write("Checking for attic files\n")
             #check that attic fiels aren't in trackDb
             if self.trackDb:
                 errors.extend(self.__checkAtticNotInTrackDb())
 
 
 
             #checks to see that nothing has disappeared between public and alpha
             if self.verbose >= 1:
                 sys.stderr.write("Checking new metaDb for missing stanzas\n")
             errors.extend(self.__checkAlphaForDropped("alpha metaDb", "stanza"))