Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package moin. The 1.9.4-6 upload works fine, but only on python 2.7 and newer sue to the use of subprocess.check_output(). I've rewritten the changes there to use subprocess.Popen() and .communicate() instead, so that the squeeze backport will work fine for wiki.d.o too. Tiny debdiff for 1.9.4-7 attached. unblock moin/1.9.4-7 Cheers, Steve -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores) Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru moin-1.9.4/debian/changelog moin-1.9.4/debian/changelog --- moin-1.9.4/debian/changelog 2012-07-30 19:52:42.000000000 +0100 +++ moin-1.9.4/debian/changelog 2012-08-10 14:31:06.000000000 +0100 @@ -1,3 +1,11 @@ +moin (1.9.4-7) unstable; urgency=low + + * subprocess.check_output only appeared in python 2.7. Use + subprocess.Popen and .communicate() instead to get the same effect but + working on older python versions too. + + -- Steve McIntyre <[email protected]> Fri, 10 Aug 2012 14:20:26 +0100 + moin (1.9.4-6) unstable; urgency=low * Fix the error message displayed when external_creation_check fails diff -Nru moin-1.9.4/debian/patches/mail-verification.patch moin-1.9.4/debian/patches/mail-verification.patch --- moin-1.9.4/debian/patches/mail-verification.patch 2012-07-30 19:52:05.000000000 +0100 +++ moin-1.9.4/debian/patches/mail-verification.patch 2012-08-10 15:42:54.000000000 +0100 @@ -56,7 +56,7 @@ # try to get the password and pw repeat password = form.get('password1', '') -@@ -77,18 +108,48 @@ +@@ -77,18 +108,49 @@ email = wikiutil.clean_input(form.get('email', '')) theuser.email = email.strip() if not theuser.email and 'email' not in request.cfg.user_form_remove: @@ -89,10 +89,11 @@ + # Send verification links if desired + if request.cfg.require_email_verification: + if request.cfg.external_creation_check: -+ create_error = subprocess.check_output([request.cfg.external_creation_check, -+ theuser.name, -+ theuser.email, -+ theuser.account_creation_host]) ++ p = subprocess.Popen([request.cfg.external_creation_check, ++ theuser.name, ++ theuser.email, ++ theuser.account_creation_host], shell=False, stdin=None, stdout=subprocess.PIPE, stderr=subprocess.PIPE) ++ (create_error, ignored) = p.communicate(None) + if create_error: + request.theme.add_msg(_("Account creation failed: %s." % create_error), "error") + mailok, msg = _send_verification_mail(request, theuser)
