[printrun] Fix upstream issue 438 properly
Miro Hrončok
churchyard at fedoraproject.org
Sat Nov 9 13:30:54 UTC 2013
commit 8b44d6aa5ab6c1a33ccca43babdcdddc168c847b
Author: Miro Hrončok <miro at hroncok.cz>
Date: Sat Nov 9 14:30:51 2013 +0100
Fix upstream issue 438 properly
printrun-issue438.patch | 23 +++++++++++++++++------
printrun.spec | 3 +++
2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/printrun-issue438.patch b/printrun-issue438.patch
index a772b8b..fc57094 100644
--- a/printrun-issue438.patch
+++ b/printrun-issue438.patch
@@ -1,16 +1,27 @@
+From 768b7e2576d32af217c5f1b3eafaa456b43e3f36 Mon Sep 17 00:00:00 2001
+From: Guillaume Seguin <guillaume at segu.in>
+Date: Sun, 20 Oct 2013 11:15:18 +0200
+Subject: [PATCH] Harden against #438
+
+---
+ printrun/gviz.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
diff --git a/printrun/gviz.py b/printrun/gviz.py
-index 53c0105..509383b 100755
+index 53c0105..429b04c 100755
--- a/printrun/gviz.py
+++ b/printrun/gviz.py
-@@ -100,7 +100,10 @@ class GvizWindow(GvizBaseFrame):
+@@ -100,7 +100,9 @@ def set_current_gline(self, gline):
def process_slider(self, event):
self.p.layerindex = self.layerslider.GetValue()
- self.SetStatusText(_("Layer %d - Going Up - Z = %.03f mm") % (self.p.layerindex + 1, self.p.layers[self.p.layerindex]), 0)
-+ try:
-+ self.SetStatusText(_("Layer %d - Going Up - Z = %.03f mm") % (self.p.layerindex + 1, self.p.layers[self.p.layerindex]), 0)
-+ except TypeError:
-+ pass
++ z = self.p.layers[self.p.layerindex]
++ z = 0. if z is None else z
++ self.SetStatusText(_("Layer %d - Going Up - Z = %.03f mm") % (self.p.layerindex + 1, z), 0)
self.p.dirty = 1
wx.CallAfter(self.p.Refresh)
+--
+1.8.4
+
diff --git a/printrun.spec b/printrun.spec
index f944b61..b526665 100644
--- a/printrun.spec
+++ b/printrun.spec
@@ -189,6 +189,9 @@ rm -f %{buildroot}%{_bindir}/prontserve*
%doc README* COPYING
%changelog
+* Sat Nov 09 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.10.19-3
+- Fix upstream issue 438 properly
+
* Tue Oct 29 2013 Miro Hrončok <mhroncok at redhat.com> - 2013.10.19-2
- Added patch to workaround upstream issue 438
More information about the scm-commits
mailing list