Namespace sanitizing, step 1

svn path=/main/trunk/; revision=5778

7 files changed, 0 insertions, 139 deletions

diff --git a/pym/elog_modules/__init__.py b/pym/elog_modules/__init__.py
deleted file mode 100644
index e69de29bb..000000000
--- a/pym/elog_modules/__init__.py
+++ /dev/null
diff --git a/pym/elog_modules/mod_custom.py b/pym/elog_modules/mod_custom.py
deleted file mode 100644
index d609e79ba..000000000
--- a/pym/elog_modules/mod_custom.py
+++ /dev/null
@@ -1,16 +0,0 @@
-import elog_modules.mod_save, portage_exec, portage_exception
-
-def process(mysettings, cpv, logentries, fulltext):
-	elogfilename = elog_modules.mod_save.process(mysettings, cpv, logentries, fulltext)
-	
-	if (not "PORTAGE_ELOG_COMMAND" in mysettings.keys()) \
-			or len(mysettings["PORTAGE_ELOG_COMMAND"]) == 0:
-		raise portage_exception.MissingParameter("!!! Custom logging requested but PORTAGE_ELOG_COMMAND is not defined")
-	else:
-		mylogcmd = mysettings["PORTAGE_ELOG_COMMAND"]
-		mylogcmd = mylogcmd.replace("${LOGFILE}", elogfilename)
-		mylogcmd = mylogcmd.replace("${PACKAGE}", cpv)
-		retval = portage_exec.spawn_bash(mylogcmd)
-		if retval != 0:
-			raise portage_exception.PortageException("!!! PORTAGE_ELOG_COMMAND failed with exitcode %d" % retval)
-	return
diff --git a/pym/elog_modules/mod_mail.py b/pym/elog_modules/mod_mail.py
deleted file mode 100644
index b8e17a51a..000000000
--- a/pym/elog_modules/mod_mail.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# portage.py -- core Portage functionality
-# Copyright 1998-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-import portage_mail, socket
-
-def process(mysettings, cpv, logentries, fulltext):
-	if mysettings.has_key("PORTAGE_ELOG_MAILURI"):
-		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0]
-	else:
-		myrecipient = "root@localhost"
-	
-	myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
-	mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
-	mysubject = mysubject.replace("${PACKAGE}", cpv)
-	mysubject = mysubject.replace("${HOST}", socket.getfqdn())
-
-	mymessage = portage_mail.create_message(myfrom, myrecipient, mysubject, fulltext)
-	portage_mail.send_mail(mysettings, mymessage)
-
-	return
diff --git a/pym/elog_modules/mod_mail_summary.py b/pym/elog_modules/mod_mail_summary.py
deleted file mode 100644
index 5e642f418..000000000
--- a/pym/elog_modules/mod_mail_summary.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# portage.py -- core Portage functionality
-# Copyright 1998-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id: mod_mail.py 3484 2006-06-10 22:38:44Z genone $
-
-import portage_mail, socket, os, time
-from email.MIMEText import MIMEText as TextMessage
-
-_items = {}
-def process(mysettings, cpv, logentries, fulltext):
-	header = ">>> Messages generated for package %s by process %d on %s:\n\n" % \
-		(cpv, os.getpid(), time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time())))
-	_items[cpv] = header + fulltext
-
-def finalize(mysettings):
-	if len(_items) == 0:
-		return
-	elif len(_items) == 1:
-		count = "one package"
-	else:
-		count = "multiple packages"
-	if mysettings.has_key("PORTAGE_ELOG_MAILURI"):
-		myrecipient = mysettings["PORTAGE_ELOG_MAILURI"].split()[0]
-	else:
-		myrecipient = "root@localhost"
-	
-	myfrom = mysettings["PORTAGE_ELOG_MAILFROM"]
-	mysubject = mysettings["PORTAGE_ELOG_MAILSUBJECT"]
-	mysubject = mysubject.replace("${PACKAGE}", count)
-	mysubject = mysubject.replace("${HOST}", socket.getfqdn())
-
-	mybody = "elog messages for the following packages generated by " + \
-		"process %d on host %s:\n" % (os.getpid(), socket.getfqdn())
-	for cpv in _items.keys():
-		 mybody += "- %s\n" % cpv
-
-	mymessage = portage_mail.create_message(myfrom, myrecipient, mysubject, mybody, attachments=_items.values())
-	portage_mail.send_mail(mysettings, mymessage)
-
-	return
diff --git a/pym/elog_modules/mod_save.py b/pym/elog_modules/mod_save.py
deleted file mode 100644
index 4e1cd2cf8..000000000
--- a/pym/elog_modules/mod_save.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import os, time
-from portage_data import portage_uid, portage_gid
-
-def process(mysettings, cpv, logentries, fulltext):
-	cpv_path = cpv.replace("/", ":")
-
-	if mysettings["PORT_LOGDIR"] != "":
-		elogdir = os.path.join(mysettings["PORT_LOGDIR"], "elog")
-	else:
-		elogdir = os.path.join(os.sep, "var", "log", "portage", "elog")
-	if not os.path.exists(elogdir):
-		os.makedirs(elogdir)
-	os.chown(elogdir, portage_uid, portage_gid)
-	os.chmod(elogdir, 02770)
-
-	elogfilename = elogdir+"/"+cpv_path+":"+time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time()))+".log"
-	elogfile = open(elogfilename, "w")
-	elogfile.write(fulltext)
-	elogfile.close()
-
-	return elogfilename
diff --git a/pym/elog_modules/mod_save_summary.py b/pym/elog_modules/mod_save_summary.py
deleted file mode 100644
index 7cb310d95..000000000
--- a/pym/elog_modules/mod_save_summary.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os, time
-from portage_data import portage_uid, portage_gid
-
-def process(mysettings, cpv, logentries, fulltext):
-	if mysettings["PORT_LOGDIR"] != "":
-		elogdir = os.path.join(mysettings["PORT_LOGDIR"], "elog")
-	else:
-		elogdir = os.path.join(os.sep, "var", "log", "portage", "elog")
-	if not os.path.exists(elogdir):
-		os.makedirs(elogdir)
-	os.chown(elogdir, portage_uid, portage_gid)
-	os.chmod(elogdir, 02770)
-
-	# TODO: Locking
-	elogfilename = elogdir+"/summary.log"
-	elogfile = open(elogfilename, "a")
-	elogfile.write(">>> Messages generated by process %d on %s for package %s:\n\n" % \
-			(os.getpid(), time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime(time.time())), cpv))
-	elogfile.write(fulltext)
-	elogfile.write("\n")
-	elogfile.close()
-
-	return elogfilename
diff --git a/pym/elog_modules/mod_syslog.py b/pym/elog_modules/mod_syslog.py
deleted file mode 100644
index a95ecb452..000000000
--- a/pym/elog_modules/mod_syslog.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import syslog
-from portage_const import EBUILD_PHASES
-
-def process(mysettings, cpv, logentries, fulltext):
-	syslog.openlog("portage", syslog.LOG_ERR | syslog.LOG_WARNING | syslog.LOG_INFO | syslog.LOG_NOTICE, syslog.LOG_LOCAL5)
-	for phase in EBUILD_PHASES:
-		if not phase in logentries:
-			continue
-		for msgtype,msgcontent in logentries[phase]:
-			pri = {"INFO": syslog.LOG_INFO, 
-				"WARN": syslog.LOG_WARNING, 
-				"ERROR": syslog.LOG_ERR, 
-				"LOG": syslog.LOG_NOTICE,
-				"QA": syslog.LOG_WARNING}
-			msgtext = "".join(msgcontent)
-			syslog.syslog(pri[msgtype], "%s: %s: %s" % (cpv, phase, msgtext))
-	syslog.closelog()