diff options
| author |   Paul Varner <fuzzyray@gentoo.org> | 2010-11-19 20:24:24 +0000 |
|---|---|---|
| committer | Paul Varner <fuzzyray@gentoo.org> | 2010-11-19 20:24:24 +0000 |
| commit | 0f114a0d328fa394f0b9eff5ac4d29f1138b7e73 (patch) | |
| tree | c039b4a74b4f50c070545c24b98cdb0b1dfa968e /app-portage | |
| parent | Stable on amd64 wrt bug #345483 (diff) | |
| download | gentoo-2-0f114a0d328fa394f0b9eff5ac4d29f1138b7e73.tar.gz gentoo-2-0f114a0d328fa394f0b9eff5ac4d29f1138b7e73.tar.bz2 gentoo-2-0f114a0d328fa394f0b9eff5ac4d29f1138b7e73.zip | |
Fix UnicodeDecodeError in setup.py, bug 346001
(Portage version: 2.1.9.24/cvs/Linux i686)
Diffstat (limited to 'app-portage')
| -rw-r--r-- | app-portage/gentoolkit/ChangeLog | 6 | ||||
| -rw-r--r-- | app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch | 28 | ||||
| -rw-r--r-- | app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/app-portage/gentoolkit/ChangeLog b/app-portage/gentoolkit/ChangeLog index 8a6c86681986..5a32485aabdd 100644 --- a/app-portage/gentoolkit/ChangeLog +++ b/app-portage/gentoolkit/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-portage/gentoolkit # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.198 2010/11/19 16:50:20 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/ChangeLog,v 1.199 2010/11/19 20:24:24 fuzzyray Exp $ + + 19 Nov 2010; Paul Varner <fuzzyray@gentoo.org> + +files/0.3.0_rc11-setup.py.patch, gentoolkit-0.3.0_rc11-r1.ebuild: + Fix UnicodeDecodeError in setup.py, bug 346001 19 Nov 2010; Jeremy Olexa <darkside@gentoo.org> gentoolkit-0.3.0_rc11-r1.ebuild: diff --git a/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch b/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch new file mode 100644 index 000000000000..b75e33280894 --- /dev/null +++ b/app-portage/gentoolkit/files/0.3.0_rc11-setup.py.patch @@ -0,0 +1,28 @@ +Index: setup.py +=================================================================== +--- setup.py (revision 857) ++++ setup.py (working copy) +@@ -10,6 +10,7 @@ + from glob import glob + + import os ++import io + + sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'pym')) + +@@ -59,13 +60,13 @@ + def sub(files, pattern): + for f in files: + updated_file = [] +- with open(f) as s: ++ with io.open(f, 'r', 1, 'utf_8') as s: + for line in s: + newline = re.sub(pattern, '"%s"' % ver, line, 1) + if newline != line: + log.info("%s: %s" % (f, newline)) + updated_file.append(newline) +- with open(f, 'w') as s: ++ with io.open(f, 'w', 1, 'utf_8') as s: + s.writelines(updated_file) + quote = r'[\'"]{1}' + bash_re = r'(?<=VERSION=)' + quote + '[^\'"]*' + quote diff --git a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild index 4033b9f75952..d07d5cb317ad 100644 --- a/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild +++ b/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.2 2010/11/19 16:50:20 darkside Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-portage/gentoolkit/gentoolkit-0.3.0_rc11-r1.ebuild,v 1.3 2010/11/19 20:24:24 fuzzyray Exp $ EAPI="3" SUPPORT_PYTHON_ABIS="1" @@ -39,6 +39,7 @@ distutils_src_compile_pre_hook() { src_prepare() { epatch "${FILESDIR}/${PV}-eshowkw_indir.patch" + epatch "${FILESDIR}/${PV}-setup.py.patch" } src_install() { |