1 |
From 87ff1532e65e64c86fa80437944bda223aff3d93 Mon Sep 17 00:00:00 2001 |
2 |
From: Brian Dolbec <dolsen@g.o> |
3 |
Date: Sat, 3 Oct 2015 10:14:11 -0700 |
4 |
Subject: [PATCH] repoman/argparser.py: _unicode_decode the commitmsg (bug |
5 |
562108) |
6 |
|
7 |
Force utf-8 for the comit message to prevent a possible traceback. |
8 |
X-Gentoo-bug: 562108 |
9 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=562108 |
10 |
--- |
11 |
pym/repoman/argparser.py | 5 ++++- |
12 |
1 file changed, 4 insertions(+), 1 deletion(-) |
13 |
|
14 |
diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py |
15 |
index 85e261d..0f34ed0 100644 |
16 |
--- a/pym/repoman/argparser.py |
17 |
+++ b/pym/repoman/argparser.py |
18 |
@@ -1,4 +1,3 @@ |
19 |
-# -*- coding:utf-8 -*- |
20 |
# repoman: Argument parser |
21 |
# Copyright 2007-2014 Gentoo Foundation |
22 |
# Distributed under the terms of the GNU General Public License v2 |
23 |
@@ -11,6 +10,7 @@ import sys |
24 |
# import our initialized portage instance |
25 |
from repoman._portage import portage |
26 |
|
27 |
+from portage import _unicode_decode |
28 |
from portage import util |
29 |
from portage.util._argparse import ArgumentParser |
30 |
|
31 |
@@ -211,6 +211,9 @@ def parse_args(argv, qahelp, repoman_default_opts): |
32 |
logger = logging.getLogger() |
33 |
logger.setLevel(logger.getEffectiveLevel() + 10) |
34 |
|
35 |
+ if opts.mode == 'commit' and opts.commitmsg: |
36 |
+ opts.commitmsg = _unicode_decode(opts.commitmsg) |
37 |
+ |
38 |
if opts.mode == 'commit' and not (opts.force or opts.pretend): |
39 |
if opts.ignore_masked: |
40 |
opts.ignore_masked = False |
41 |
-- |
42 |
2.5.3 |
43 |
|
44 |
|
45 |
|
46 |
-- |
47 |
Brian Dolbec <dolsen> |