[printrun] Removing UTF-8 removal from patch
Miro Hrončok
churchyard at fedoraproject.org
Wed Jan 23 15:59:05 UTC 2013
commit 18fa0767059c0f15b1fb02dce2808399feb0d023
Author: Miro Hrončok <miro at hroncok.cz>
Date: Wed Jan 23 16:58:59 2013 +0100
Removing UTF-8 removal from patch
printrun-pull-318.patch | 27 ++++++++++++++++++++++++++-
printrun.spec | 5 ++++-
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/printrun-pull-318.patch b/printrun-pull-318.patch
index f8b0f4d..540e1e3 100644
--- a/printrun-pull-318.patch
+++ b/printrun-pull-318.patch
@@ -1,7 +1,7 @@
From f942c1a00724a87ef0d115cc237bf48f8c837a70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
Date: Tue, 15 Jan 2013 21:22:56 +0100
-Subject: [PATCH] Tell the user, there was an error while connecting
+Subject: [PATCH 1/2] Tell the user, there was an error while connecting
Before, when there was an error while connecting, user didn't know, when
Pronterface wasn't launched from the terminal.
@@ -80,3 +80,28 @@ index 476ffb9..c13b8f7 100755
--
1.7.10
+
+From ee386e00919210991775550ff2f0a23887f042f2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro at hroncok.cz>
+Date: Wed, 23 Jan 2013 16:55:38 +0100
+Subject: [PATCH 2/2] Adding UTF-8 decoding back
+
+---
+ pronterface.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pronterface.py b/pronterface.py
+index c13b8f7..87a18a3 100755
+--- a/pronterface.py
++++ b/pronterface.py
+@@ -73,7 +73,7 @@ def write(self, data):
+ self.target(data)
+ except:
+ pass
+- self.stdout.write(data)
++ self.stdout.write(data.encode("utf-8"))
+ def flush(self):
+ self.stdout.flush()
+
+--
+1.7.10
diff --git a/printrun.spec b/printrun.spec
index 1670906..6b493d8 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -3,7 +3,7 @@
%global snapshot 20130113git%{shortcommit}
Name: printrun
Version: 0.0
-Release: 19.%{snapshot}%{?dist}
+Release: 20.%{snapshot}%{?dist}
Summary: RepRap printer interface and tools
License: GPLv3+
Group: Applications/Engineering
@@ -152,6 +152,9 @@ cd -
%doc README* COPYING
%changelog
+* Wed Jan 23 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-20.20130113git5897fbc
+- Removing UTF-8 removal from patch
+
* Sat Jan 19 2013 Miro Hrončok <mhroncok at redhat.com> - 0.0-19.20130113git5897fbc
- Removed run-time deps, that are resolved automatically
More information about the scm-commits
mailing list