summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2007-04-30 02:31:30 +0000
committerMarius Mauch <genone@gentoo.org>2007-04-30 02:31:30 +0000
commit644a6284be66bc1648a930e7c19749741df09a5e (patch)
treeb18404d6f495deb758ec3a8cd8224742a9f78344
parentFor bug #175058, avoid potential quoting issues by spawning FETCHCOMMAND with... (diff)
downloadportage-idfetch-644a6284be66bc1648a930e7c19749741df09a5e.tar.gz
portage-idfetch-644a6284be66bc1648a930e7c19749741df09a5e.tar.bz2
portage-idfetch-644a6284be66bc1648a930e7c19749741df09a5e.zip
- add new echo module for people who don't want any real logging
- add copyright header in elog modules and enable keyword substitution - enable save_summary and echo modules in make.globals svn path=/main/trunk/; revision=6458
-rw-r--r--cnf/make.conf1
-rw-r--r--cnf/make.globals1
-rw-r--r--pym/portage/elog/__init__.py5
-rw-r--r--pym/portage/elog/mod_custom.py5
-rw-r--r--pym/portage/elog/mod_echo.py30
-rw-r--r--pym/portage/elog/mod_mail.py4
-rw-r--r--pym/portage/elog/mod_mail_summary.py6
-rw-r--r--pym/portage/elog/mod_save.py5
-rw-r--r--pym/portage/elog/mod_save_summary.py5
-rw-r--r--pym/portage/elog/mod_syslog.py5
10 files changed, 62 insertions, 5 deletions
diff --git a/cnf/make.conf b/cnf/make.conf
index e135ac12..9b08bc51 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -309,6 +309,7 @@ PORTAGE_ELOG_CLASSES="warn error log"
# PORTAGE_ELOG_SYSTEM: selects the module(s) to process the log messages. Modules
# included in portage are (empty means logging is disabled):
+# echo (display messages again when emerge exits)
# save (saves one log per package in $PORT_LOGDIR/elog,
# /var/log/portage/elog if $PORT_LOGDIR is unset)
# custom (passes all messages to $PORTAGE_ELOG_COMMAND)
diff --git a/cnf/make.globals b/cnf/make.globals
index 45ffea68..a186f0fd 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -72,6 +72,7 @@ PORTAGE_WORKDIR_MODE="0700"
# Some defaults for elog
PORTAGE_ELOG_CLASSES="log warn error"
+PORTAGE_ELOG_SYSTEM="save_summary echo"
PORTAGE_ELOG_MAILURI="root"
PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index c6f6ec47..be7eb5b6 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -1,3 +1,8 @@
+# elog/__init__.py - elog core functions
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
from portage.const import EBUILD_PHASES
from portage.exception import PortageException
from portage.process import atexit_register
diff --git a/pym/portage/elog/mod_custom.py b/pym/portage/elog/mod_custom.py
index 5fae8407..3433bbbf 100644
--- a/pym/portage/elog/mod_custom.py
+++ b/pym/portage/elog/mod_custom.py
@@ -1,3 +1,8 @@
+# elog/mod_custom.py - elog dispatch module
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
import portage.elog_modules.mod_save, portage.process, portage.exception
def process(mysettings, cpv, logentries, fulltext):
diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
new file mode 100644
index 00000000..73928b43
--- /dev/null
+++ b/pym/portage/elog/mod_echo.py
@@ -0,0 +1,30 @@
+# elog/mod_echo.py - elog dispatch module
+# Copyright 2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+from portage.output import EOutput
+from portage.const import EBUILD_PHASES
+
+_items = {}
+def process(mysettings, cpv, logentries, fulltext):
+ _items[cpv] = logentries
+
+def finalize(mysettings):
+ printer = EOutput()
+ for cpv in _items.keys():
+ print
+ printer.einfo("Messages for package %s:" % cpv)
+ print
+ for phase in EBUILD_PHASES:
+ if not phase in _items[cpv]:
+ continue
+ for msgtype, msgcontent in _items[cpv][phase]:
+ fmap = {"INFO": printer.einfo,
+ "WARN": printer.ewarn,
+ "ERROR": printer.eerror,
+ "LOG": printer.einfo,
+ "QA": printer.ewarn}
+ for line in msgcontent:
+ fmap[msgtype](line.strip("\n"))
+ return
diff --git a/pym/portage/elog/mod_mail.py b/pym/portage/elog/mod_mail.py
index b84555e8..4695e8ec 100644
--- a/pym/portage/elog/mod_mail.py
+++ b/pym/portage/elog/mod_mail.py
@@ -1,5 +1,5 @@
-# portage.py -- core Portage functionality
-# Copyright 1998-2004 Gentoo Foundation
+# elog/mod_mail.py - elog dispatch module
+# Copyright 2006-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index 99c28564..a1f4ed57 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -1,7 +1,7 @@
-# portage.py -- core Portage functionality
-# Copyright 1998-2004 Gentoo Foundation
+# elog/mod_mail_summary.py - elog dispatch module
+# Copyright 2006-2007 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 $
+# $Id$
import portage.mail, socket, os, time
from email.MIMEText import MIMEText as TextMessage
diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py
index 2993b45d..eff40edd 100644
--- a/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@ -1,3 +1,8 @@
+# elog/mod_save.py - elog dispatch module
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
import os, time
from portage.data import portage_uid, portage_gid
diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_save_summary.py
index eb453e58..aebc6f9a 100644
--- a/pym/portage/elog/mod_save_summary.py
+++ b/pym/portage/elog/mod_save_summary.py
@@ -1,3 +1,8 @@
+# elog/mod_save_summary.py - elog dispatch module
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
import os, time
from portage.data import portage_uid, portage_gid
diff --git a/pym/portage/elog/mod_syslog.py b/pym/portage/elog/mod_syslog.py
index 77e1d4ea..28aa15b3 100644
--- a/pym/portage/elog/mod_syslog.py
+++ b/pym/portage/elog/mod_syslog.py
@@ -1,3 +1,8 @@
+# elog/mod_syslog.py - elog dispatch module
+# Copyright 2006-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
import syslog
from portage.const import EBUILD_PHASES