From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 6 Jul 2010 20:54:41 +0000 (+0200)
Subject: dont replace the path in DAILY_APT_CONF right now, make it nicer later in an AptCOnf... 
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1f351aa3e676e93c926045a90dd93574ba412664;p=dak.git

dont replace the path in DAILY_APT_CONF right now, make it nicer later in an AptCOnf class. also dont call with the suite name, it knows it anyways

Signed-off-by: Joerg Jaspert <joerg@debian.org>
---

diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index 79db33ba..d91ec8fc 100755
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -105,7 +105,7 @@ def main ():
         for a in arch_list:
             Logger.log(['generating output for Suite %s, Architecture %s' % (s.suite_name, a.arch_string)])
             print 'generating output for Suite %s, Architecture %s' % (s.suite_name, a.arch_string)
-            threadpool.queueTask(s.generate_packages_sources, (s.suite_name, a.arch_string))
+            threadpool.queueTask(s.generate_packages_sources, (a.arch_string))
 
     threadpool.joinAll()
     # this script doesn't change the database
diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 97c2bc38..28db5c03 100755
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -2462,7 +2462,7 @@ SUITE_FIELDS = [ ('SuiteName', 'suite_name'),
 DAILY_APT_CONF="""
 Dir
 {
-   ArchiveDir "%(archivepath)s";
+   ArchiveDir "/srv/ftp-master.debian.org/ftp/";
    OverrideDir "/srv/ftp-master.debian.org/scripts/override/";
    CacheDir "/srv/ftp-master.debian.org/database/";
 };
@@ -2671,7 +2671,7 @@ class Suite(object):
 
         return "\n".join(ret)
 
-    def generate_packages_sources(self, suite, arch):
+    def generate_packages_sources(self, arch):
         """
         Generate Packages/Sources files with apt-ftparchive for the given suite/arch
 
@@ -2688,9 +2688,9 @@ class Suite(object):
         try:
             # Write apt.conf
             (ac_fd, ac_name) = mkstemp()
-            os.write(ac_fd, DAILY_APT_CONF % {'archivepath': self.path})
+            os.write(ac_fd, DAILY_APT_CONF)
             # here we want to generate the tree entries
-            os.write(ac_fd, apt_trees[suite] % {'arch': arch})
+            os.write(ac_fd, apt_trees[self.suite_name] % {'arch': arch})
             os.close(ac_fd)
 
             # Run apt-ftparchive generate