X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=amber;h=8e2469d640fccbe6ea0fb2bbe7b3b2cd5880eba5;hb=80b0cf4b95f879ce7e6e41297bced5c4e955f697;hp=404b52853b98d92bafa9fe741f011f2490c0ac6e;hpb=c846e77a848d60dd115f00faa0d9a854161d99eb;p=dak.git

diff --git a/amber b/amber
index 404b5285..8e2469d6 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.6 2002-10-16 02:47:32 troup Exp $
+# Copyright (C) 2002, 2003, 2004  James Troup <james@nocrew.org>
+# $Id: amber,v 1.10 2004-11-27 19:23:40 troup 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
@@ -195,7 +196,7 @@ def make_advisory(advisory_nr, changes_files):
                     "poolname": dscpoolname };
 
     if os.environ.has_key("SUDO_UID"):
-        whoami = os.environ["SUDO_UID"].atol();
+        whoami = long(os.environ["SUDO_UID"]);
     else:
         whoami = os.getuid();
     whoamifull = pwd.getpwuid(whoami);
@@ -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>]";