extras-repoclosure rc-report.py,1.12,1.13

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14294

Modified Files:
	rc-report.py 
Log Message:
now it should mail pkg owner every 14 days


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rc-report.py	19 Jul 2006 16:58:14 -0000	1.12
+++ rc-report.py	19 Jul 2006 18:31:44 -0000	1.13
@@ -14,8 +14,6 @@
 
 domail = 1
 mailsummary = 1
-savehistory = 1
-usehistory = True
 
 maxmailsize = 39*1024
 
@@ -46,8 +44,8 @@
         f.close()
         # Build up history/expired dicts.
         for srcrpm,tmpdict in self.tmpdict.iteritems():
-            discovereddate = tmpdict['discovered']
-            if ( discovereddate+waitdelta > today ):
+            reporteddate = tmpdict['reported']
+            if ( reporteddate+waitdelta > today ):
                 self.history[srcrpm] = self.tmpdict[srcrpm]
             else:
                 # Filter out entries which are too old.
@@ -56,8 +54,8 @@
                 self.expired[srcrpm] = self.tmpdict[srcrpm]
 
     def Save(self):
-        for srcrpm,timestamp in self.incoming.iteritems():
-            self.Set(srcrpm,timestamp,timestamp)
+        for srcrpm,dict in self.incoming.iteritems():
+            self.history[srcrpm] = dict
         f = file(self.historyname,'w')
         pickle.dump(self.history,f)
         f.close()
@@ -68,8 +66,11 @@
             'reported' : reporteddate
             }
 
-    def SetDelayed(self,srcrpmname,timestamp):
-        self.incoming[srcrpmname] = timestamp
+    def SetDelayed(self,srcrpmname,discovereddate,reporteddate):
+        self.incoming[srcrpmname] = {
+            'discovered' : discovereddate,
+            'reported' : reporteddate
+            }
 
     def Get(self,srcrpmname):
         try:
@@ -77,9 +78,12 @@
         except KeyError:
             try:
                 r = self.expired[srcrpmname]
-                self.Set(srcrpmname,r['discovered'],r['reported'])
+                # Reactivate an expired entry next time.
+                self.SetDelayed(srcrpmname,r['discovered'],today)
             except KeyError:
-                r = 0
+                # Store new entry.
+                self.SetDelayed(srcrpmname,today,today)
+            r = 0
         return r
 
     def GetAge(self,srcrpmname):
@@ -200,9 +204,7 @@
         if ( len(w) >= 3 ):
             srcrpm = w[2]
             inbody = True
-            createreport = not (usehistory and history.Get(srcrpm))
-            if usehistory and not history.Get(srcrpm):
-                history.SetDelayed(srcrpm,today)
+            createreport = not history.Get(srcrpm)
         else:
             inbody = False
         continue
@@ -251,8 +253,7 @@
         if not line.isspace() and not line.startswith('package: ') and line.find('unresolved deps:') < 0:
             summary[repoid][pkgid].append( line.rstrip().lstrip() )
 
-if savehistory:
-    history.Save()
+history.Save()
 
 owners = pkgbyowner.keys()
 owners.sort()