From: Mike O'Connor <stew@vireo.org>
Date: Tue, 5 Jan 2010 20:40:11 +0000 (-0500)
Subject: get rid of testing code (hardcoded 'unstable','testing', /home/stew paths, etc)
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=f634a4b19d5ec88a368914a6068d4d78cde886a2;p=dak.git

get rid of testing code (hardcoded 'unstable','testing', /home/stew paths, etc)

Signed-off-by: Mike O'Connor <stew@vireo.org>
---

diff --git a/dak/contents.py b/dak/contents.py
index 23c160a3..b0350e9a 100755
--- a/dak/contents.py
+++ b/dak/contents.py
@@ -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
 
diff --git a/dak/dakdb/update15.py b/dak/dakdb/update15.py
old mode 100644
new mode 100755
diff --git a/dak/dakdb/update19.py b/dak/dakdb/update19.py
old mode 100644
new mode 100755
diff --git a/dak/dakdb/update25.py b/dak/dakdb/update25.py
old mode 100644
new mode 100755
diff --git a/dak/dakdb/update28.py b/dak/dakdb/update28.py
old mode 100644
new mode 100755
index 6e73c750..dc39409a
--- a/dak/dakdb/update28.py
+++ b/dak/dakdb/update28.py
@@ -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
 
diff --git a/daklib/utils.py b/daklib/utils.py
index 6642622f..37b542da 100644
--- a/daklib/utils.py
+++ b/daklib/utils.py
@@ -36,7 +36,6 @@ import stat
 import apt_pkg
 import time
 import re
-import string
 import email as modemail
 import subprocess