[SCM] morituri/master: Fix encoding of non-ASCII dates in log file

[lool at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit faedca7b9b290a64d09c111bf94b0efbbe25ca92
Author: Loïc Minier <lool at dooz.org>
Date:   Thu Dec 2 18:15:35 2010 +0100

    Fix encoding of non-ASCII dates in log file

diff --git a/debian/patches/1004_fix-non-ascii-date.patch b/debian/patches/1004_fix-non-ascii-date.patch
new file mode 100644
index 0000000..e55849d
--- /dev/null
+++ b/debian/patches/1004_fix-non-ascii-date.patch
@@ -0,0 +1,22 @@
+Description: Fix encoding of non-ASCII dates in log file
+From: Loïc Minier <lool at dooz.org>
+Forwarded: https://thomas.apestaart.org/morituri/trac/ticket/49
+Last-Update: 2010-12-02
+--- a/morituri/result/logger.py
++++ b/morituri/result/logger.py
+@@ -20,6 +20,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with morituri.  If not, see <http://www.gnu.org/licenses/>.
+ 
++import locale
+ import time
+ 
+ from morituri.common import common
+@@ -40,6 +41,7 @@
+ 
+         lines.append("Logfile created by: morituri %s" % configure.version)
+         date = time.strftime("%b %d %H:%M:%S", time.localtime(epoch))
++        date = unicode(date, locale.getpreferredencoding())
+         lines.append("Logfile created on: %s" % date)
+         lines.append("")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 30b371e..6e71430 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 1001_fix-non-ascii-htoa.patch
 1002_fix-htoa-m3u-filename.patch
 1003_ignore-other-matches.patch
+1004_fix-non-ascii-date.patch

-- 
morituri packaging