oops, sorry fernaNda...

[dak.git] / melanie

diff --git a/melanie b/melanie
index 26d2146deaccfa3a28dd1cd68277d41bfb93d118..91288a82d616062fc07766decb81fdfc20f95750 100755 (executable)
--- a/melanie
+++ b/melanie
@@ -2,7 +2,7 @@
 
 # General purpose archive tool for ftpmaster
 # Copyright (C) 2000, 2001  James Troup <james@nocrew.org>
-# $Id: melanie,v 1.12 2001-04-03 10:05:35 troup Exp $
+# $Id: melanie,v 1.14 2001-06-22 22:53:14 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
@@ -232,8 +232,6 @@ def main ():
                     source = re_strip_source_version.sub('', source);
                     if source_packages.has_key(source):
                         to_remove.append(i[2:]);
-                    #else:
-                        #sys.stderr.write("W: skipping '%s' as it's source ('%s') isn't one of the source packages.\n" % (filename, source));
     print "done."
 
     # If we don't have a reason; spawn an editor so the user can add one
@@ -302,7 +300,7 @@ def main ():
         
     game_over();
 
-    whoami = string.replace(string.split(pwd.getpwuid(os.getuid())[4],',')[0], '.', '');
+    whoami = utils.whoami();
     date = commands.getoutput('date -R');
 
     # Log first; if it all falls apart I want a record that we at least tried.
@@ -359,7 +357,7 @@ def main ():
         else:
             bcc = "Bcc: " + bcc;
         Subst["__BCC__"] = bcc[:-2];
-        Subst["__CC__"] = "X-Melanie: $Revision: 1.12 $\n" + carbon_copy[:-1];
+        Subst["__CC__"] = "X-Melanie: $Revision: 1.14 $\n" + carbon_copy[:-1];
         Subst["__SUITE_LIST__"] = suites_list;
         Subst["__SUMMARY__"] = summary;
         Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];