mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-04-29 16:37:30 -07:00
56bd759df1
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
34 lines
1.3 KiB
Diff
34 lines
1.3 KiB
Diff
X-Git-Url: https://dndg.it/cgi-bin/gitweb.cgi?p=public%2Fpsycopg2.git;a=blobdiff_plain;f=psycopg%2Fpqpath.c;h=1f0d5da95bd88aa4d5468874047e4b0139ffadd3;hp=cee5ce4c9c053981710959ca28b7e68702c44a97;hb=de6f2ac387231fcd57c05031c82471ea57255e2b;hpb=d9fce1f837151e6eadfd8ca761ef328a721198bd
|
|
|
|
diff --git a/psycopg/pqpath.c b/psycopg/pqpath.c
|
|
index cee5ce4..1f0d5da 100644
|
|
--- a/psycopg/pqpath.c
|
|
+++ b/psycopg/pqpath.c
|
|
@@ -344,11 +344,13 @@ pq_execute_command_locked(connectionObject *conn, const char *query,
|
|
}
|
|
if (*pgres == NULL) {
|
|
Dprintf("pq_execute_command_locked: PQexec returned NULL");
|
|
+ PyEval_RestoreThread(*tstate);
|
|
if (!PyErr_Occurred()) {
|
|
const char *msg;
|
|
msg = PQerrorMessage(conn->pgconn);
|
|
if (msg && *msg) { *error = strdup(msg); }
|
|
}
|
|
+ *tstate = PyEval_SaveThread();
|
|
goto cleanup;
|
|
}
|
|
|
|
@@ -635,11 +637,13 @@ pq_get_guc_locked(
|
|
|
|
if (*pgres == NULL) {
|
|
Dprintf("pq_get_guc_locked: PQexec returned NULL");
|
|
+ PyEval_RestoreThread(*tstate);
|
|
if (!PyErr_Occurred()) {
|
|
const char *msg;
|
|
msg = PQerrorMessage(conn->pgconn);
|
|
if (msg && *msg) { *error = strdup(msg); }
|
|
}
|
|
+ *tstate = PyEval_SaveThread();
|
|
goto cleanup;
|
|
}
|
|
if (PQresultStatus(*pgres) != PGRES_TUPLES_OK) {
|