summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2005-12-19 17:39:13 +0000
committerMarius Mauch <genone@gentoo.org>2005-12-19 17:39:13 +0000
commit8a3d0341eb100e4e560b7554c4eef83724cc45df (patch)
tree972785fab06c416f36e680c70980b9e6d2e33bf6
parentdf2ef02671608c6c182e7f2a92f3b56868d10d9d (diff)
downloadportage-8a3d0341eb100e4e560b7554c4eef83724cc45df.tar.gz
portage-8a3d0341eb100e4e560b7554c4eef83724cc45df.tar.bz2
portage-8a3d0341eb100e4e560b7554c4eef83724cc45df.zip
fix custom module (bug #116024)
svn path=/main/trunk/; revision=2408
-rw-r--r--pym/elog_modules/mod_custom.py6
-rw-r--r--pym/elog_modules/mod_save.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/pym/elog_modules/mod_custom.py b/pym/elog_modules/mod_custom.py
index eebbdd55b..d609e79ba 100644
--- a/pym/elog_modules/mod_custom.py
+++ b/pym/elog_modules/mod_custom.py
@@ -1,15 +1,15 @@
import elog_modules.mod_save, portage_exec, portage_exception
def process(mysettings, cpv, logentries, fulltext):
- elog_modules.mod_save.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.replace("${LOGFILE}", elogfilename)
- mylogcmd.replace("${PACKAGE}", cpv)
+ 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)
diff --git a/pym/elog_modules/mod_save.py b/pym/elog_modules/mod_save.py
index 970c526f4..106e8800a 100644
--- a/pym/elog_modules/mod_save.py
+++ b/pym/elog_modules/mod_save.py
@@ -15,4 +15,4 @@ def process(mysettings, cpv, logentries, fulltext):
elogfile.write(fulltext)
elogfile.close()
- return
+ return elogfilename