From: Mark Hymers <mhy@debian.org>
Date: Wed, 4 Nov 2009 18:25:27 +0000 (+0000)
Subject: Merge commit 'mhy/master'
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=b0769907773d8b5b4a8fbcb4906f048997cc26f6;hp=8d6090f15f39085e197db475f24e6409b93bb400;p=dak.git

Merge commit 'mhy/master'
---

diff --git a/config/backports.org/cron.hourly b/config/backports.org/cron.hourly
index 45980065..b5e06462 100755
--- a/config/backports.org/cron.hourly
+++ b/config/backports.org/cron.hourly
@@ -53,6 +53,7 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 dak make-suite-file-list
+dak generate-filelist
 
 # Generate override files
 cd $overridedir
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 4d1195a9..71840f5a 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -249,6 +249,14 @@ GO=(
 )
 stage $GO
 
+GO=(
+    FUNC="filelist"
+    TIME="generate-filelist"
+    ARGS=""
+    ERR=""
+)
+stage $GO
+
 GO=(
     FUNC="fingerprints"
     TIME="import-keyring"
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a78c2c8d..57c67c79 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -134,6 +134,11 @@ function msfl() {
     dak make-suite-file-list
 }
 
+function filelist() {
+    log "Generating file lists for apt-ftparchive"
+    dak generate-filelist
+}
+
 function fingerprints() {
     log "Not updating fingerprints - scripts needs checking"
 
diff --git a/dak/generate_filelist.py b/dak/generate_filelist.py
index 02f5f185..d0a64596 100755
--- a/dak/generate_filelist.py
+++ b/dak/generate_filelist.py
@@ -36,6 +36,7 @@ def getSources(suite, component, session):
         SELECT path, filename
             FROM srcfiles_suite_component
             WHERE suite = :suite AND component = :component
+            ORDER BY filename
     """
     args = { 'suite': suite.suite_id,
              'component': component.component_id }
@@ -47,6 +48,7 @@ def getBinaries(suite, component, architecture, type, session):
             FROM binfiles_suite_component_arch
             WHERE suite = :suite AND component = :component AND type = :type AND
                   (architecture = :architecture OR architecture = 2)
+            ORDER BY filename
     """
     args = { 'suite': suite.suite_id,
              'component': component.component_id,
diff --git a/dak/make_suite_file_list.py b/dak/make_suite_file_list.py
index 349a4ae0..8c131009 100755
--- a/dak/make_suite_file_list.py
+++ b/dak/make_suite_file_list.py
@@ -361,7 +361,9 @@ SELECT s.id, s.source, 'source', s.version, l.path, f.filename, c.name, f.id,
                                    suite=suite, filetype = filetype)
     cleanup(packages, session)
     session.commit()
-    write_filelists(packages, dislocated_files, session)
+
+    # has been replaced by 'dak generate-filelist':
+    #write_filelists(packages, dislocated_files, session)
 
 ################################################################################
 
diff --git a/dak/new_security_install.py b/dak/new_security_install.py
index f8706ed9..23b765f6 100755
--- a/dak/new_security_install.py
+++ b/dak/new_security_install.py
@@ -474,6 +474,7 @@ def _do_Approve():
     # 3. run dak make-suite-file-list / apt-ftparchve / dak generate-releases
     print "Updating file lists for apt-ftparchive..."
     spawn("dak make-suite-file-list")
+    spawn("dak generate-filelist")
     print "Updating Packages and Sources files..."
     spawn("/org/security.debian.org/dak/config/debian-security/map.sh")
     spawn("apt-ftparchive generate %s" % (utils.which_apt_conf_file()))