Patchwork [2,of,3] exewrapper: report name of failed private DLL in error message

login
register
mail settings
Submitter Adrian Buehlmann
Date Oct. 14, 2015, 10:38 a.m.
Message ID <0bda366cf908c3ed6b67.1444819094@kork>
Download mbox | patch
Permalink /patch/11045/
State Accepted
Headers show

Comments

Adrian Buehlmann - Oct. 14, 2015, 10:38 a.m.
# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1444818184 -7200
# Node ID 0bda366cf908c3ed6b67efed9d648efb3066bd78
# Parent  b8bf5a263a32ff73a4da0ba1512c0f1c42b49b88
exewrapper: report name of failed private DLL in error message

Same as in preceding change, but this time it's for the private Python of
HackableMercurial (in hg-python directory next to the hg.exe).

Patch

diff --git a/mercurial/exewrapper.c b/mercurial/exewrapper.c
--- a/mercurial/exewrapper.c
+++ b/mercurial/exewrapper.c
@@ -90,7 +90,8 @@ 
 			strcat_s(pydllfile, sizeof(pydllfile), "\\" HGPYTHONLIB);
 			pydll = LoadLibrary(pydllfile);
 			if (pydll == NULL) {
-				err = "failed to load private Python DLL";
+				err = "failed to load private Python DLL "
+				      HGPYTHONLIB ".dll";
 				goto bail;
 			}
 			Py_SetPythonHome = (void*)GetProcAddress(pydll,