From 4688f15f215f2d09a52238f059eca56761aaa014 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Sat, 10 Jun 2006 21:40:40 +0000 Subject: make elog mail module always set the 'From' header for rfc2822 compliance svn path=/main/trunk/; revision=3483 --- pym/cache/__init__.py | 2 +- pym/cache/anydbm.py | 2 +- pym/cache/cache_errors.py | 2 +- pym/cache/flat_hash.py | 2 +- pym/cache/fs_template.py | 2 +- pym/cache/mappings.py | 2 +- pym/cache/metadata.py | 2 +- pym/cache/sql_template.py | 2 +- pym/cache/template.py | 2 +- pym/cache/util.py | 2 +- pym/cvstree.py | 2 +- pym/dispatch_conf.py | 2 +- pym/elog_modules/mod_mail.py | 1 + pym/emergehelp.py | 2 +- pym/getbinpkg.py | 2 +- pym/output.py | 2 +- pym/portage.py | 4 ++-- pym/portage_checksum.py | 2 +- pym/portage_const.py | 2 +- pym/portage_data.py | 2 +- pym/portage_dep.py | 2 +- pym/portage_exception.py | 2 +- pym/portage_exec.py | 2 +- pym/portage_file.py | 2 +- pym/portage_gpg.py | 2 +- pym/portage_localization.py | 2 +- pym/portage_locks.py | 2 +- pym/portage_util.py | 2 +- pym/xpak.py | 2 +- 29 files changed, 30 insertions(+), 29 deletions(-) (limited to 'pym') diff --git a/pym/cache/__init__.py b/pym/cache/__init__.py index 189885cb0..cb1b59d69 100644 --- a/pym/cache/__init__.py +++ b/pym/cache/__init__.py @@ -1,5 +1,5 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: __init__.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ diff --git a/pym/cache/anydbm.py b/pym/cache/anydbm.py index 09a1cf8b1..e250980b9 100644 --- a/pym/cache/anydbm.py +++ b/pym/cache/anydbm.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: anydbm.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ anydbm_module = __import__("anydbm") try: diff --git a/pym/cache/cache_errors.py b/pym/cache/cache_errors.py index 2f5b831bf..f63e5994b 100644 --- a/pym/cache/cache_errors.py +++ b/pym/cache/cache_errors.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: cache_errors.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ class CacheError(Exception): pass diff --git a/pym/cache/flat_hash.py b/pym/cache/flat_hash.py index 3a49a05de..59b00e8d4 100644 --- a/pym/cache/flat_hash.py +++ b/pym/cache/flat_hash.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: flat_list.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import fs_template import cache_errors diff --git a/pym/cache/fs_template.py b/pym/cache/fs_template.py index 49d5ca073..c63856da1 100644 --- a/pym/cache/fs_template.py +++ b/pym/cache/fs_template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: fs_template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import os import template, cache_errors diff --git a/pym/cache/mappings.py b/pym/cache/mappings.py index 2251c4449..9aa5a21e2 100644 --- a/pym/cache/mappings.py +++ b/pym/cache/mappings.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: mappings.py 2015 2005-09-20 23:14:26Z ferringb $ +# $Id$ import UserDict diff --git a/pym/cache/metadata.py b/pym/cache/metadata.py index 1fb19b398..329af224c 100644 --- a/pym/cache/metadata.py +++ b/pym/cache/metadata.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: metadata.py 1964 2005-09-03 00:16:16Z ferringb $ +# $Id$ import os, stat, types import flat_hash diff --git a/pym/cache/sql_template.py b/pym/cache/sql_template.py index c69ed772f..92e9e8713 100644 --- a/pym/cache/sql_template.py +++ b/pym/cache/sql_template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: sql_template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import template, cache_errors from template import reconstruct_eclasses diff --git a/pym/cache/template.py b/pym/cache/template.py index 097ebed8d..419ec08a4 100644 --- a/pym/cache/template.py +++ b/pym/cache/template.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: template.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import cache_errors from mappings import ProtectedDict diff --git a/pym/cache/util.py b/pym/cache/util.py index 204b549b6..0c8e585fd 100644 --- a/pym/cache/util.py +++ b/pym/cache/util.py @@ -1,7 +1,7 @@ # Copyright: 2005 Gentoo Foundation # Author(s): Brian Harring (ferringb@gentoo.org) # License: GPL2 -# $Id: util.py 1911 2005-08-25 03:44:21Z ferringb $ +# $Id$ import cache_errors diff --git a/pym/cvstree.py b/pym/cvstree.py index 6e91af9ef..53b9f6222 100644 --- a/pym/cvstree.py +++ b/pym/cvstree.py @@ -1,7 +1,7 @@ # cvstree.py -- cvs tree utilities # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/cvstree.py,v 1.12.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import string,os,time,sys,re diff --git a/pym/dispatch_conf.py b/pym/dispatch_conf.py index 9ca57f0da..9e2c0bd2d 100644 --- a/pym/dispatch_conf.py +++ b/pym/dispatch_conf.py @@ -1,7 +1,7 @@ # archive_conf.py -- functionality common to archive-conf and dispatch-conf # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/dispatch_conf.py,v 1.3.2.3 2005/04/29 03:37:30 jstubbs Exp $ +# $Id$ # Library by Wayne Davison , derived from code diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py index 68771ba51..cc67015f7 100644 --- a/pym/elog_modules/mod_mail.py +++ b/pym/elog_modules/mod_mail.py @@ -37,6 +37,7 @@ def process(mysettings, cpv, logentries, fulltext): mymessage.set_unixfrom(myfrom) mymessage.set_payload(fulltext) mymessage["To"] = myrecipient + mymessage["From"] = myfrom mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"] mysubject = mysubject.replace("${PACKAGE}", cpv) diff --git a/pym/emergehelp.py b/pym/emergehelp.py index 94f4d6732..ff6c4e6c8 100644 --- a/pym/emergehelp.py +++ b/pym/emergehelp.py @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/emergehelp.py,v 1.8.2.2 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os,sys diff --git a/pym/getbinpkg.py b/pym/getbinpkg.py index 0bd0d3622..2fe92b2de 100644 --- a/pym/getbinpkg.py +++ b/pym/getbinpkg.py @@ -1,7 +1,7 @@ # getbinpkg.py -- Portage binary-package helper functions # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/getbinpkg.py,v 1.12.2.3 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ from output import * diff --git a/pym/output.py b/pym/output.py index fe15ea471..375917411 100644 --- a/pym/output.py +++ b/pym/output.py @@ -1,6 +1,6 @@ # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/output.py,v 1.24.2.4 2005/04/17 09:01:55 jstubbs Exp $ +# $Id$ import commands,errno,os,re,shlex,sys diff --git a/pym/portage.py b/pym/portage.py index ffeed06a1..f65b43c6c 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1,10 +1,10 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage.py,v 1.524.2.76 2005/05/29 12:40:08 jstubbs Exp $ +# $Id$ -VERSION="$Rev$"[6:-2] + "-svn" +VERSION="$Rev: 3387 $"[6:-2] + "-svn" # =========================================================================== # START OF IMPORTS -- START OF IMPORTS -- START OF IMPORTS -- START OF IMPORT diff --git a/pym/portage_checksum.py b/pym/portage_checksum.py index 30f221532..fd659eea2 100644 --- a/pym/portage_checksum.py +++ b/pym/portage_checksum.py @@ -1,7 +1,7 @@ # portage_checksum.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_checksum.py,v 1.10.2.2 2005/08/10 05:42:03 ferringb Exp $ +# $Id$ from portage_const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE diff --git a/pym/portage_const.py b/pym/portage_const.py index 1820a3ac5..faf20c2c3 100644 --- a/pym/portage_const.py +++ b/pym/portage_const.py @@ -1,7 +1,7 @@ # portage: Constants # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_const.py,v 1.3.2.3 2005/04/29 04:56:35 jstubbs Exp $ +# $Id$ # =========================================================================== diff --git a/pym/portage_data.py b/pym/portage_data.py index 1f2e67e57..99874fcf4 100644 --- a/pym/portage_data.py +++ b/pym/portage_data.py @@ -1,7 +1,7 @@ # portage_data.py -- Calculated/Discovered Data Values # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_data.py,v 1.5.2.2 2005/02/26 11:22:38 carpaski Exp $ +# $Id$ import os,pwd,grp diff --git a/pym/portage_dep.py b/pym/portage_dep.py index dc0ee4d14..ece3c72dc 100644 --- a/pym/portage_dep.py +++ b/pym/portage_dep.py @@ -1,7 +1,7 @@ # deps.py -- Portage dependency resolution functions # Copyright 2003-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_dep.py,v 1.15.2.3 2005/04/02 14:07:59 jstubbs Exp $ +# $Id$ # DEPEND SYNTAX: diff --git a/pym/portage_exception.py b/pym/portage_exception.py index c90b17567..57eafb505 100644 --- a/pym/portage_exception.py +++ b/pym/portage_exception.py @@ -1,6 +1,6 @@ # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_exception.py,v 1.8.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ class PortageException(Exception): diff --git a/pym/portage_exec.py b/pym/portage_exec.py index 4f7fef2b9..cfa605918 100644 --- a/pym/portage_exec.py +++ b/pym/portage_exec.py @@ -1,7 +1,7 @@ # portage.py -- core Portage functionality # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_exec.py,v 1.13.2.4 2005/04/17 09:01:56 jstubbs Exp $ +# $Id$ import os, atexit, signal, sys diff --git a/pym/portage_file.py b/pym/portage_file.py index 970d42fbb..711ba098b 100644 --- a/pym/portage_file.py +++ b/pym/portage_file.py @@ -1,7 +1,7 @@ # portage_data.py -- Calculated/Discovered Data Values # Copyright 1998-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_file.py,v 1.3.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os diff --git a/pym/portage_gpg.py b/pym/portage_gpg.py index 2465b18a7..04ed60046 100644 --- a/pym/portage_gpg.py +++ b/pym/portage_gpg.py @@ -1,7 +1,7 @@ # portage_gpg.py -- core Portage functionality # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_gpg.py,v 1.6.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import os diff --git a/pym/portage_localization.py b/pym/portage_localization.py index ba47b06b0..59ccea711 100644 --- a/pym/portage_localization.py +++ b/pym/portage_localization.py @@ -1,7 +1,7 @@ # portage_localization.py -- Code to manage/help portage localization. # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_localization.py,v 1.2.2.1 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ # We define this to make the transition easier for us. diff --git a/pym/portage_locks.py b/pym/portage_locks.py index 30946c437..4c7da6d31 100644 --- a/pym/portage_locks.py +++ b/pym/portage_locks.py @@ -1,7 +1,7 @@ # portage: Lock management code # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_locks.py,v 1.18.2.2 2005/01/16 02:35:33 carpaski Exp $ +# $Id$ import errno diff --git a/pym/portage_util.py b/pym/portage_util.py index 58827489d..8adc483e5 100644 --- a/pym/portage_util.py +++ b/pym/portage_util.py @@ -1,6 +1,6 @@ # Copyright 2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/portage_util.py,v 1.11.2.6 2005/04/23 07:26:04 jstubbs Exp $ +# $Id$ from portage_exception import PortageException, FileNotFound, OperationNotPermitted, ReadOnlyFileSystem diff --git a/pym/xpak.py b/pym/xpak.py index c5c487e0a..46cdfd8df 100644 --- a/pym/xpak.py +++ b/pym/xpak.py @@ -1,6 +1,6 @@ # Copyright 2001-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id: /var/cvsroot/gentoo-src/portage/pym/xpak.py,v 1.13.2.3 2005/02/26 11:22:38 carpaski Exp $ +# $Id$ # The format for a tbz2/xpak: -- cgit v1.2.3-1-g7c22