rpms/vte/F-11 python-env-passing.patch, NONE, 1.1 vte.spec, 1.150, 1.151

[Daniel Drake]

Author: dsd

Update of /cvs/pkgs/rpms/vte/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9899

Modified Files:
	vte.spec 
Added Files:
	python-env-passing.patch 
Log Message:
fix environment passing bug in python bindings

python-env-passing.patch:
 vte.override |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

--- NEW FILE python-env-passing.patch ---
>From 3c22f5997c7e11f371c606520daff279d9b613e4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad at behdad.org>
Date: Tue, 29 Sep 2009 18:54:30 +0000
Subject: Bug 587894 - the environment passing with python does no longer work

---
diff --git a/python/vte.override b/python/vte.override
index 29c3316..196b935 100644
--- a/python/vte.override
+++ b/python/vte.override
@@ -112,7 +112,7 @@ _build_envv(PyObject *py_envv, char ***envv)
 	int i, pos, n_envs;
 	PyObject *py_dict_k, *py_dict_v;
 
-	if (py_envv == NULL || py_envv != Py_None) {
+	if (py_envv == NULL || py_envv == Py_None) {
 		return 0;
 	}
 
@@ -122,20 +122,20 @@ _build_envv(PyObject *py_envv, char ***envv)
 		pos = 0;
 		i = 0;
 		while (PyDict_Next(py_envv, &pos, &py_dict_k, &py_dict_v)) {
-			*envv[i++] = g_strdup_printf("%s=%s",
+			(*envv)[i++] = g_strdup_printf("%s=%s",
 				PyString_AsString(py_dict_k),
 				PyString_AsString(py_dict_v));
 		}
-		*envv[n_envs] = NULL;
+		(*envv)[n_envs] = NULL;
 	} else if (PySequence_Check(py_envv)) {
 		n_envs = PySequence_Length(py_envv);
 		*envv = g_new(gchar *, n_envs + 1);
 		for (i = 0; i < n_envs; i++) {
 			PyObject *item = PySequence_GetItem(py_envv, i);
 			Py_DECREF(item);  /* PySequence_GetItem INCREF's */
-			*envv[i] = PyString_AsString(item);
+			(*envv)[i] = PyString_AsString(item);
 		}
-		*envv[n_envs] = NULL;
+		(*envv)[n_envs] = NULL;
 	} else {
 		PyErr_SetString(PyExc_TypeError,
 				"envv must be a sequence or a dictionary");
--
cgit v0.8.2


Index: vte.spec
===================================================================
RCS file: /cvs/pkgs/rpms/vte/F-11/vte.spec,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -p -r1.150 -r1.151
--- vte.spec	10 Jun 2009 02:36:13 -0000	1.150
+++ vte.spec	8 Dec 2009 13:58:53 -0000	1.151
@@ -4,7 +4,7 @@
 
 Name: vte
 Version: 0.20.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A terminal emulator
 License: LGPLv2+
 Group: User Interface/X
@@ -22,6 +22,8 @@ BuildRequires: intltool
 # initscripts creates the utmp group
 Prereq: initscripts
 
+Patch1: python-env-passing.patch
+
 %description
 VTE is a terminal emulator widget for use with GTK+ 2.0.
 
@@ -43,6 +45,7 @@ vte.
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 PYTHON=%{_bindir}/python`%{__python} -c "import sys ; print sys.version[:3]"`
@@ -108,6 +111,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*
 %doc %{_datadir}/gtk-doc/html/%{name}
 
 %changelog
+* Tue Dec  8 2009 Daniel Drake <dsd at laptop.org> 0.20.5-2
+- Add upstream patch to fix environment bug with Python bindings (#537391)
+
 * Tue Jun  9 2009 Matthias Clasen <mclasen at redhat.com> 0.20.5-1
 - Update to 0.20.5