Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-commits
Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-commits@g.o
From: "Fabian Groffen (grobian)" <grobian@g.o>
Subject: portage r11246 - in main/branches/prefix: bin pym/portage pym/portage/elog
Date: Mon, 28 Jul 2008 20:03:56 +0000
Author: grobian
Date: 2008-07-28 20:03:55 +0000 (Mon, 28 Jul 2008)
New Revision: 11246

Modified:
   main/branches/prefix/bin/isolated-functions.sh
   main/branches/prefix/pym/portage/__init__.py
   main/branches/prefix/pym/portage/elog/messages.py
Log:
   Merged from trunk 11243:11245

   | 11244   | Even though the message is split on $'\n' in elog_base(),    |
   | zmedico | it's still not entirely safe to use it as a delimiter in the |
   |         | log file since there can still be escaped newlines that will |
   |         | be expanded due to the echo -e parameter.                    |
   
   | 11245   | Bug #233103 - In portage.fetch(), pass all config variables  |
   | zmedico | instead of just those returned by the environ() method which |
   |         | is filtered.                                                 |


Modified: main/branches/prefix/bin/isolated-functions.sh
===================================================================
--- main/branches/prefix/bin/isolated-functions.sh	2008-07-28 20:00:40 UTC (rev 11245)
+++ main/branches/prefix/bin/isolated-functions.sh	2008-07-28 20:03:55 UTC (rev 11246)
@@ -177,10 +177,14 @@
 			return 1
 			;;
 	esac
+	# Note: Even though the message is split on $'\n' here, it's still
+	# not entirely safe to use it as a delimiter in the log file since
+	# there can still be escaped newlines that will be expanded due to
+	# the echo -e parameter.
 	save_IFS
 	IFS=$'\n'
 	for line in $* ; do
-		echo -ne "${messagetype} ${line}\n" >> \
+		echo -ne "${messagetype} ${line}\n\0" >> \
 			"${T}/logging/${EBUILD_PHASE:-other}"
 	done
 	restore_IFS

Modified: main/branches/prefix/pym/portage/__init__.py
===================================================================
--- main/branches/prefix/pym/portage/__init__.py	2008-07-28 20:00:40 UTC (rev 11245)
+++ main/branches/prefix/pym/portage/__init__.py	2008-07-28 20:03:55 UTC (rev 11246)
@@ -3868,7 +3868,7 @@
 							myfetch = ["bash", "-c", "exec \"$@\"", myfetch[0]] + myfetch
 
 						myret = portage.process.spawn(myfetch,
-							env=mysettings.environ(), **spawn_keywords)
+							env=dict(mysettings.iteritems()), **spawn_keywords)
 
 						if mysettings.selinux_enabled():
 							selinux.setexec(None)

Modified: main/branches/prefix/pym/portage/elog/messages.py
===================================================================
--- main/branches/prefix/pym/portage/elog/messages.py	2008-07-28 20:00:40 UTC (rev 11245)
+++ main/branches/prefix/pym/portage/elog/messages.py	2008-07-28 20:03:55 UTC (rev 11246)
@@ -35,7 +35,7 @@
 			logentries[msgfunction] = []
 		lastmsgtype = None
 		msgcontent = []
-		for l in open(filename, "r"):
+		for l in open(filename, "r").read().split("\0"):
 			if not l:
 				continue
 			try:



Navigation:
Lists: gentoo-commits: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
gentoo-x86 commit in sys-cluster/charm: metadata.xml ChangeLog
Next by thread:
gentoo-x86 commit in app-editors/nvu: metadata.xml ChangeLog
Previous by date:
gentoo-x86 commit in sys-cluster/charm: metadata.xml ChangeLog
Next by date:
gentoo-x86 commit in profiles: ChangeLog use.local.desc


Updated Feb 05, 2012

Summary: Archive of the gentoo-commits mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.