extras-repoclosure rc-report.py,1.23,1.24

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	rc-report.py 
Log Message:
sync


Index: rc-report.py
===================================================================
RCS file: /cvs/fedora/extras-repoclosure/rc-report.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- rc-report.py	27 Sep 2006 22:50:22 -0000	1.23
+++ rc-report.py	29 Sep 2006 22:31:52 -0000	1.24
@@ -83,26 +83,25 @@
             }
 
     def Get(self,srcrpmname):
-        r = None
-        try:
-            r = self.history[srcrpmname]
-        except KeyError:
-            try:
-                r = self.expired[srcrpmname]
-                # Reactivate an expired entry next time.
-                self.SetDelayed(srcrpmname,r['discovered'],today)
-                r = None  # resend mail
-            except KeyError:
-                # Store new entry.
-                self.SetDelayed(srcrpmname,today,today)
-        return r
+        if self.history.has_key(srcrpmname):
+            return self.history[srcrpmname]
+        elif self.expired.has_key(srcrpmname):
+            # Reactivate an expired entry next time.
+            self.SetDelayed(srcrpmname,self.expired[srcrpmname]['discovered'],today)
+            return None  # resend mail
+        else:
+            # Store new entry.
+            self.SetDelayed(srcrpmname,today,today)
+            return None
 
     def GetAge(self,srcrpmname):
-        r = self.Get(srcrpmname)
-        if not r:
+        if self.history.has_key(srcrpmname):
+            r = self.history[srcrpmname]
+        elif self.expired.has_key(srcrpmname):
+            r = self.expired[srcrpmname]
+        else:
             return ''
-        discovereddate = r['discovered']
-        d = today-discovereddate
+        d = today-r['discovered']
         if d.days >= 2:
             return '(%s days)' % d.days
         return ''