From: James Troup Date: Fri, 13 Apr 2001 20:13:30 +0000 (+0000) Subject: use whoami in utils X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aba56aad0ca957e7bfca30abc9ed34943dd6ddaf;p=dak use whoami in utils --- diff --git a/melanie b/melanie index 26d2146d..9546c35d 100755 --- a/melanie +++ b/melanie @@ -2,7 +2,7 @@ # General purpose archive tool for ftpmaster # Copyright (C) 2000, 2001 James Troup -# $Id: melanie,v 1.12 2001-04-03 10:05:35 troup Exp $ +# $Id: melanie,v 1.13 2001-04-13 20:13:30 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 @@ -302,7 +302,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 +359,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.13 $\n" + carbon_copy[:-1]; Subst["__SUITE_LIST__"] = suites_list; Subst["__SUMMARY__"] = summary; Subst["__ADMIN_ADDRESS__"] = Cnf["Dinstall::MyAdminAddress"];