X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=amber;h=01276f7779b2da9caa53f741fa559d4462c3331c;hb=8ceeff88ecfd72516aa8f462d05c9e1bf382ed1b;hp=db80a0d7a97c60fd92c2a812646d5f10a29baa4c;hpb=78efdca66122f0c48453419e109f0fbd6f095342;p=dak.git

diff --git a/amber b/amber
index db80a0d7..01276f77 100755
--- a/amber
+++ b/amber
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 
 # Wrapper for Debian Security team
-# Copyright (C) 2002  James Troup <james@nocrew.org>
-# $Id: amber,v 1.7 2002-11-22 14:55:51 troup Exp $
+# Copyright (C) 2002, 2003  James Troup <james@nocrew.org>
+# $Id: amber,v 1.9 2004-10-13 15:58:13 rmurray Exp $
 
 # 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
@@ -65,6 +65,7 @@ def do_upload(changes_files):
         component_mapping[component] = Cnf["Amber::ComponentMappings::%s" % (component)];
     uploads = {}; # uploads[uri] = file_list;
     package_list = {} # package_list[source_name][version];
+    changes_files.sort(utils.changes_compare);
     for changes_file in changes_files:
         changes_file = utils.validate_changes_file_arg(changes_file);
         # Reset variables
@@ -254,7 +255,7 @@ def make_advisory(advisory_nr, changes_files):
 
     adv = utils.TemplateSubst(Subst, Cnf["Dir::Templates"]+"/amber.advisory");
     if not Options["No-Action"]:
-        utils.send_mail (adv, "");
+        utils.send_mail (adv);
     else:
         print "[<Would send template advisory mail>]";