On Tue, Nov 18, 2014 at 05:55:57PM +0000, Alessio Treglia wrote: > Hey Iain, > > On Tue, Nov 18, 2014 at 5:46 PM, Iain Lane <i...@orangesquash.org.uk> wrote: > > Attached is a patch to fix this. I'm going to upload to Ubuntu, along > > with switching to gir1.2-vte-2.91. If you fix this in Debian, feel free > > to sync. :) > > Thanks a lot for the patch! > Would you mind to apply it to the git's repository too please?
I don't think I can (don't see a Debian ACL there), but here's a git format-patch you can apply. -- Iain Lane [ i...@orangesquash.org.uk ] Debian Developer [ la...@debian.org ] Ubuntu Developer [ la...@ubuntu.com ]
From ef5e90a26ded59002aa4ed7dedb74af7692ad92d Mon Sep 17 00:00:00 2001
From: Iain Lane <iain.l...@canonical.com>
Date: Thu, 20 Nov 2014 11:31:23 +0000
Subject: [PATCH] Fix call to feed() - in python it takes just the string to
feed, not the length too.
Closes: #770076
---
debian/changelog | 7 +++++++
debian/patches/series | 1 +
debian/patches/vte-feed-api-fix | 23 +++++++++++++++++++++++
3 files changed, 31 insertions(+)
create mode 100644 debian/patches/series
create mode 100644 debian/patches/vte-feed-api-fix
diff --git a/debian/changelog b/debian/changelog
index 3cd9249..5998663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+laditools (1.0.1-3) UNRELEASED; urgency=medium
+
+ * Fix call to feed() - in python it takes just the string to feed, not the
+ length too. (Closes: #770076)
+
+ -- Iain Lane <iain.l...@canonical.com> Thu, 20 Nov 2014 11:29:53 +0000
+
laditools (1.0.1-2) unstable; urgency=low
* Depends on python-gi-cairo.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..f214284
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+vte-feed-api-fix
diff --git a/debian/patches/vte-feed-api-fix b/debian/patches/vte-feed-api-fix
new file mode 100644
index 0000000..f9770f9
--- /dev/null
+++ b/debian/patches/vte-feed-api-fix
@@ -0,0 +1,23 @@
+Description: feed() only takes one parameter
+Author: Iain Lane <iain.l...@canonical.com>
+
+--- laditools-1.0.1.orig/ladi-system-log
++++ laditools-1.0.1/ladi-system-log
+@@ -160,7 +160,7 @@ class LadiSystemLog(LadiApp):
+ lines = read_last(log['log_file'], self.max_lines)
+ for line in lines:
+ line = line.strip('\r\n') + '\r\n'
+- log["term"].feed(line, -1)
++ log["term"].feed(line)
+ except ValueError:
+ sys.stderr.write( _("You called Popen with invalid arguments... dumbass\n") )
+ except:
+@@ -175,7 +175,7 @@ class LadiSystemLog(LadiApp):
+ for log in self.log_files:
+ line = log['log_file'].readline()
+ while line:
+- log["term"].feed(line + '\r', -1)
++ log["term"].feed(line + '\r')
+ line = log['log_file'].readline()
+ log['log_file'].seek(log['log_file'].tell())
+ return True
--
2.1.3
signature.asc
Description: Digital signature
