aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdano Arendartchuk <bogdano@mandriva.org>2007-06-21 21:14:06 +0000
committerBogdano Arendartchuk <bogdano@mandriva.org>2007-06-21 21:14:06 +0000
commitf2a8ac768aa4a6563c4050cac0bf80a1f04734ee (patch)
treebd5ad2493e921142e6a56708ded3b5aa056d7f56
parentd3737579678b5e38c972ed36f9cbcc90c0c0483f (diff)
downloadmgarepo-f2a8ac768aa4a6563c4050cac0bf80a1f04734ee.tar
mgarepo-f2a8ac768aa4a6563c4050cac0bf80a1f04734ee.tar.gz
mgarepo-f2a8ac768aa4a6563c4050cac0bf80a1f04734ee.tar.bz2
mgarepo-f2a8ac768aa4a6563c4050cac0bf80a1f04734ee.tar.xz
mgarepo-f2a8ac768aa4a6563c4050cac0bf80a1f04734ee.zip
protect open() from all the encoding evil of the outside world
-rw-r--r--RepSys/log.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/RepSys/log.py b/RepSys/log.py
index 756cf95..77b32db 100644
--- a/RepSys/log.py
+++ b/RepSys/log.py
@@ -13,11 +13,11 @@ import os
import re
import time
import locale
+import codecs
import glob
import tempfile
import shutil
-
default_template = """
#for $rel in $releases_by_author
* $rel.date $rel.author_name <$rel.author_email> $rel.version-$rel.release
@@ -460,6 +460,11 @@ def specfile_svn2rpm(pkgdirurl, specfile, rev=None, size=None,
submit=False, template=None, macros=[], exported=None):
newlines = []
found = 0
+
+ encoding = locale.getpreferredencoding()
+
+ def open(name, mode="r"):
+ return codecs.open(name, mode, encoding, errors="replace")
# Strip old changelogs
for line in open(specfile):