Merge commit 'ftpmaster/master'

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index b95fa633dc527e525a7b0ca314f4a33ccb032d90..549878211dd0763757ce3b8b17f311140255c16a 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -8,7 +8,7 @@ Dinstall
    SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
    SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
    SigningKeyIds "6070D3A1";
-   SendmailCommand "/usr/sbin/sendmail -odq -oi -t";
+   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
    MyEmailAddress "Debian Installer <installer@ftp-master.debian.org>";
    MyAdminAddress "ftpmaster@debian.org";
    MyHost "debian.org";  // used for generating user@my_host addresses in e.g. manual_reject()

diff --git a/config/debian/extensions.py b/config/debian/extensions.py
index 0bb51bd7e8d6281f776a578efb0a95c1fd3b4796..83ae307626ebc65fa34b78ab107046b0273d557b 100644 (file)
--- a/config/debian/extensions.py
+++ b/config/debian/extensions.py
@@ -2,7 +2,7 @@ import sys, os, textwrap
 
 import apt_pkg
 import daklib.utils, daklib.database
-import syck
+import yaml
 
 import daklib.extensions
 from daklib.extensions import replace_dak_function
@@ -30,8 +30,8 @@ def check_transition():
     sourcefile = file(transpath, 'r')
     sourcecontent = sourcefile.read()
     try:
-        transitions = syck.load(sourcecontent)
-    except syck.error, msg:
+        transitions = yaml.load(sourcecontent)
+    except yaml.YAMLError, msg:
         # This shouldn't happen, there is a wrapper to edit the file which
         # checks it, but we prefer to be safe than ending up rejecting
         # everything.

diff --git a/dak/generate_releases.py b/dak/generate_releases.py
index 95b32c17d7a42b8cb52494f5b381dd33b9a21c78..983c8573f17aacde6f3a8721fb38028db3206f2a 100755 (executable)
--- a/dak/generate_releases.py
+++ b/dak/generate_releases.py
@@ -237,6 +237,13 @@ def main ():
         files = []
 
         if AptCnf.has_key("tree::%s" % (tree)):
+            if AptCnf.has_key("tree::%s::Contents" % (tree)):
+                pass
+            else:
+                for x in os.listdir("%s/%s" % (Cnf["Dir::Root"], tree)):
+                    if x.startswith('Contents-'):
+                        files.append(x)
+
             for sec in AptCnf["tree::%s::Sections" % (tree)].split():
                 for arch in AptCnf["tree::%s::Architectures" % (tree)].split():
                     if arch == "source":

diff --git a/dak/process_new.py b/dak/process_new.py
index 8741d25ec887e0e19304b174473772ab47ae5119..d7519c7e4fddea340d78c1f51e219e6124f12734 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -1,9 +1,12 @@
 #!/usr/bin/env python
 # vim:set et ts=4 sw=4:
 
-""" Handles NEW and BYHAND packages """
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
+""" Handles NEW and BYHAND packages
 
+@contact: Debian FTP Master <ftpmaster@debian.org>
+@copyright: 2001, 2002, 2003, 2004, 2005, 2006  James Troup <james@nocrew.org>
+@license: GNU General Public License version 2 or later
+"""
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
@@ -37,7 +40,13 @@
 
 ################################################################################
 
-import copy, errno, os, readline, stat, sys, time
+import copy
+import errno
+import os
+import readline
+import stat
+import sys
+import time
 import apt_pkg, apt_inst
 import examine_package
 from daklib import database
@@ -47,10 +56,10 @@ from daklib import utils
 from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
 
 # Globals
-Cnf = None
+Cnf = None       #: Configuration, apt_pkg.Configuration
 Options = None
 Upload = None
-projectB = None
+projectB = None  #: database connection, pgobject
 Logger = None
 
 Priorities = None
@@ -727,6 +736,9 @@ def init():
             Cnf["Process-New::Options::%s" % (i)] = ""
 
     changes_files = apt_pkg.ParseCommandLine(Cnf,Arguments,sys.argv)
+    if len(changes_files) == 0:
+        changes_files = utils.get_changes_files(Cnf["Dir::Queue::New"])
+
     Options = Cnf.SubTree("Process-New::Options")
 
     if Options["Help"]: