]> err.no Git - dak/commitdiff
get rid of testing code (hardcoded 'unstable','testing', /home/stew paths, etc)
authorMike O'Connor <stew@vireo.org>
Tue, 5 Jan 2010 20:40:11 +0000 (15:40 -0500)
committerMike O'Connor <stew@vireo.org>
Tue, 5 Jan 2010 20:40:11 +0000 (15:40 -0500)
Signed-off-by: Mike O'Connor <stew@vireo.org>
dak/contents.py
dak/dakdb/update15.py [changed mode: 0644->0755]
dak/dakdb/update19.py [changed mode: 0644->0755]
dak/dakdb/update25.py [changed mode: 0644->0755]
dak/dakdb/update28.py [changed mode: 0644->0755]
daklib/utils.py

index 23c160a3b1576ee57745269aaa3de7f12d3f8803..b0350e9a74bddcbe64061272a80d8253d3a0284d 100755 (executable)
@@ -267,12 +267,10 @@ class ContentFile(object):
         """
         opens a gzip stream to the contents file
         """
-#        filepath = Config()["Contents::Root"] + self.filename
-        self.filename = "/home/stew/contents/" + self.filename
+        filepath = Config()["Contents::Root"] + self.filename
         filedir = os.path.dirname(self.filename)
         if not os.path.isdir(filedir):
             os.makedirs(filedir)
-#        self.filehandle = gzip.open(self.filename, "w")
         self.filehandle = open(self.filename, "w")
         self._write_header()
 
@@ -470,7 +468,7 @@ class Contents(object):
         Generate contents files for both deb and udeb
         """
         self.deb_generate()
-#        self.udeb_generate()
+        self.udeb_generate()
 
     def deb_generate(self):
         """
@@ -596,8 +594,7 @@ class Contents(object):
         if Config().has_key( "%s::%s" %(options_prefix,"Suite")):
             suites = utils.split_args(Config()[ "%s::%s" %(options_prefix,"Suite")])
         else:
-            suites = [ 'unstable', 'testing' ]
-#            suites = Config().SubTree("Suite").List()
+            suites = Config().SubTree("Suite").List()
 
         return suites
 
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
old mode 100644 (file)
new mode 100755 (executable)
index 6e73c75..dc39409
@@ -41,8 +41,7 @@ def suites():
     if Config().has_key( "%s::%s" %(options_prefix,"Suite")):
         suites = utils.split_args(Config()[ "%s::%s" %(options_prefix,"Suite")])
     else:
-        suites = [ 'unstable', 'testing' ]
-#            suites = Config().SubTree("Suite").List()
+        suites = Config().SubTree("Suite").List()
 
     return suites
 
index 6642622f9410938753e802cb77c40e3dbb6c378c..37b542dad0489012563d115613002039ff21ffe6 100644 (file)
@@ -36,7 +36,6 @@ import stat
 import apt_pkg
 import time
 import re
-import string
 import email as modemail
 import subprocess