Daryl, It actually looks like you are adding a two blank lines instead of removing them. Is the commit message wrong?
Thanks, -Erik -----Original Message----- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Daryl McDaniel Sent: Thursday, November 12, 2015 2:53 PM To: edk2-devel@lists.01.org; Carsey, Jaben <jaben.car...@intel.com>; Bjorge, Erik C <erik.c.bjo...@intel.com> Subject: [edk2] [PATCH 3/3] AppPkg/Python-2.7.10/edk2module.c: Update for Python 2.7.10. AppPkg/Python-2.7.10: Update file for Python-2.7.10 inclusion. Add copyright message. Remove some redundant blank lines. Remove a superfluous call to setup_confname_tables(m) from INITFUNC(). Signed-off-by: Daryl McDaniel <edk2-li...@mc2research.org> --- .../Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c index 4cf09ca..42a9aea 100644 --- a/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c +++ b/AppPkg/Applications/Python/Python-2.7.10/PyMod-2.7.10/Modules/edk2module.c @@ -2,6 +2,7 @@ OS-specific module implementation for EDK II and UEFI. Derived from posixmodule.c in Python 2.7.2. + Copyright (c) 2015, Daryl McDaniel. All rights reserved.<BR> Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR> This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD License that accompanies this distribution. @@ -2248,6 +2249,7 @@ edk2_getpid(PyObject *self, PyObject *noargs) return PyLong_FromPid(getpid()); } + #ifdef HAVE_GETLOGIN PyDoc_STRVAR(edk2_getlogin__doc__, "getlogin() -> string\n\n\ @@ -2340,7 +2342,6 @@ PyDoc_STRVAR(edk2_popen__doc__, "popen(command [, mode='r' [, bufsize]]) -> pipe\n\n\ Open a pipe to/from a command returning a file object."); -/* standard posix version of popen() support */ static PyObject * edk2_popen(PyObject *self, PyObject *args) { @@ -2369,6 +2370,7 @@ edk2_popen(PyObject *self, PyObject *args) #endif /* HAVE_POPEN */ + #if defined(HAVE_WAIT3) || defined(HAVE_WAIT4) static PyObject * wait_helper(pid_t pid, int status, struct rusage *ru) @@ -4187,9 +4189,6 @@ INITFUNC(void) if (all_ins(m)) return; - if (setup_confname_tables(m)) - return; - Py_INCREF(PyExc_OSError); PyModule_AddObject(m, "error", PyExc_OSError); -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
