Package: laditools
Version: 1.0.1-2
Severity: important
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu vivid ubuntu-patch
Greetings,
I was porting gir1.2-vte-2.90 rdeps to 2.91 earlier, and I noticed that
currently ladi-system-log doesn't work:
laney@raleigh>
Watching /home/laney/.log/jack/jackdbus.log
Watching /home/laney/.log/ladish/ladish.log
Watching /home/laney/.log/a2j/a2j.log
Loading interface from /usr/share/laditools/data/ladi-system-log.ui
Opening /home/laney/.log/jack/jackdbus.log...
Unexpected error: <type 'exceptions.TypeError'>
Opening /home/laney/.log/ladish/ladish.log...
Unexpected error: <type 'exceptions.TypeError'>
Opening /home/laney/.log/a2j/a2j.log...
Unexpected error: <type 'exceptions.TypeError'>
Traceback (most recent call last):
File "/usr/bin/ladi-system-log", line 178, in update
log["term"].feed(line + '\r', -1)
TypeError: feed() takes exactly 2 arguments (3 given)
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. :)
Cheers,
--
Iain Lane [ i...@orangesquash.org.uk ]
Debian Developer [ la...@debian.org ]
Ubuntu Developer [ la...@ubuntu.com ]
diff -Nru laditools-1.0.1/debian/changelog laditools-1.0.1/debian/changelog
diff -Nru laditools-1.0.1/debian/patches/series laditools-1.0.1/debian/patches/series
--- laditools-1.0.1/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ laditools-1.0.1/debian/patches/series 2014-11-18 17:40:29.000000000 +0000
@@ -0,0 +1 @@
+vte-feed
diff -Nru laditools-1.0.1/debian/patches/vte-feed laditools-1.0.1/debian/patches/vte-feed
--- laditools-1.0.1/debian/patches/vte-feed 1970-01-01 01:00:00.000000000 +0100
+++ laditools-1.0.1/debian/patches/vte-feed 2014-11-18 17:40:55.000000000 +0000
@@ -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
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
