Secure testing commits - May 2008 - r8857 - / bin lib/python

Author: fw
Date: 2008-05-21 08:30:08 +0000 (Wed, 21 May 2008)
New Revision: 8857

Modified:
   Makefile
   bin/tracker_service.py
   lib/python/security_db.py
Log:
Remove oldstable from the tracker


Modified: Makefile
==================================================================--- Makefile
2008-05-21 03:35:49 UTC (rev 8856)
+++ Makefile	2008-05-21 08:30:08 UTC (rev 8857)
@@ -7,7 +7,7 @@
 
 # MIRROR = http://merkel.debian.org/~aba/debian/
 MIRROR = http://ftp-stud.fht-esslingen.de/debian/
-SARGE_ARCHS = alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390
sparc
+ETCH_ARCHS = alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 LENNY_ARCHS = alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc
 
 all:
@@ -69,12 +69,12 @@
 
 SEC_MIRROR = http://security.debian.org/dists
 update-security:
-	for archive in sarge etch ; do \
+	for archive in etch ; do \
             for section in main contrib non-free ; do \
 	    $(PYTHON) bin/apt-update-file \
 	      $(SEC_MIRROR)/$$archive/updates/$$section/source/Sources \
 	      data/packages/$${archive}_security_$${section}_Sources ; \
-	    for arch in $(SARGE_ARCHS) ; do \
+	    for arch in $(ETCH_ARCHS) ; do \
 	      $(PYTHON) bin/apt-update-file \
 	        $(SEC_MIRROR)/$$archive/updates/$$section/binary-$$arch/Packages \
 	        data/packages/$${archive}_security_$${section}_$${arch}_Packages ; \

Modified: bin/tracker_service.py
==================================================================---
bin/tracker_service.py	2008-05-21 03:35:49 UTC (rev 8856)
+++ bin/tracker_service.py	2008-05-21 08:30:08 UTC (rev 8857)
@@ -160,8 +160,6 @@
              ''Vulnerable packages in the testing suite''),
             (''status/release/stable'',
              ''Vulnerable packages in the stable suite''),
-            (''status/release/oldstable'',
-             ''Vulnerable packages in the oldstable suite''),
             (''status/dtsa-candidates'', "Candidates for
DTSAs"),
             (''status/todo'', ''TODO items''),
             (''status/itp'', ''ITPs with potential
security issues''),

Modified: lib/python/security_db.py
==================================================================---
lib/python/security_db.py	2008-05-21 03:35:49 UTC (rev 8856)
+++ lib/python/security_db.py	2008-05-21 08:30:08 UTC (rev 8857)
@@ -386,7 +386,7 @@
             AND sp.subrelease = ''''
             ORDER BY sp.name, st.urgency, st.bug_name""")
 
-        for (name, nickname) in ((''stable'',
''etch''), (''oldstable'',
''sarge'')):
+        for (name, nickname) in ((''stable'',
''etch'')):
             cursor.execute(
                 """CREATE VIEW %s_status AS
                 SELECT DISTINCT sp.name AS package, st.bug_name AS bug,
@@ -1190,7 +1190,6 @@
             self._calcUnstable(c, bug_name)
             self._calcTesting(c, bug_name, ''testing'',
''lenny'')
             self._calcTesting(c, bug_name, ''stable'',
''etch'')
-            self._calcTesting(c, bug_name, ''oldstable'',
''sarge'')
 
         return result
 
@@ -1614,7 +1613,7 @@
 
             store_value(''release/1/'' + release,
''\n''.join(result))
 
-        for release in (''sid'', ''etch'',
''lenny'', ''sarge''):
+        for release in (''sid'', ''etch'',
''lenny''):
             gen_release(release)
 
         result = result_start
@@ -1627,7 +1626,7 @@
                 
     def calculateDebsecan(self):
         """Calculate all debsecan data."""
-        for release in ('''', ''sarge'',
''etch'', ''lenny''):
+        for release in ('''', ''etch'',
''lenny''):
             self.calculateDebsecan0(release)
         self.calculateDebsecan1()