Author chaselton
Recipients chaselton, ethan.furman, freakboy3742, r.david.murray, refi64
Date 2015-04-07.13:20:39
SpamBayes Score -1.0
Marked as misclassified Yes
Message-id <1428412839.32.0.510953214699.issue23496@psf.upfronthosting.co.za>
In-reply-to
Content
Will do, re: removing the '+'.

Also, attempted to apply the updated patch and got the following:

/bld/python/cpython-master $ patch -p1 < issue_20306\ \(1\).patch
patching file Modules/pwdmodule.c
Possibly reversed hunk 1 at 244
Hunk 1 FAILED 79/79.
     SETS(setIndex++, p->pw_passwd);
     PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromUid(p->pw_uid));
     PyStructSequence_SET_ITEM(v, setIndex++, _PyLong_FromGid(p->pw_gid));
+#ifdef HAVE_PASSWD_GECOS_FIELD
     SETS(setIndex++, p->pw_gecos);
+#else
+    SETS(setIndex++, Py_None);
+    Py_INCREF(Py_None);
+#endif
     SETS(setIndex++, p->pw_dir);
     SETS(setIndex++, p->pw_shell);

patching file configure.ac
Hunk 56 FAILED 4944/4944.
 AC_MSG_RESULT($ENSUREPIP)
 AC_SUBST(ENSUREPIP)

+AC_CHECK_MEMBER([struct passwd.pw_gecos],
+          [AC_DEFINE(HAVE_PASSWD_GECOS_FIELD, 1, [Define if <pwd.h> defines field passwd.pw_gecos])],
+          [],
+          [[#include <pwd.h>]])
+
 # generate output files
 AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh)
 AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix])
/bld/python/cpython-master $
History
Date User Action Args
2015-04-07 13:20:39chaseltonsetrecipients: + chaselton, r.david.murray, freakboy3742, ethan.furman, refi64
2015-04-07 13:20:39chaseltonsetmessageid: <1428412839.32.0.510953214699.issue23496@psf.upfronthosting.co.za>
2015-04-07 13:20:39chaseltonlinkissue23496 messages
2015-04-07 13:20:39chaseltoncreate