[patch] Small fix to previous patch

elogviewer-neweapi.patch (text/plain), 4.93 KB, created by Peter Levine on 2010-08-10 08:21:35 UTC

--- elogviewer.old	2010-07-27 01:50:11.982316100 -0400
+++ elogviewer	2010-07-27 01:43:19.251315114 -0400
@@ -85,7 +85,7 @@
 	except:
 		print '''
 You need to enable the elog feature by setting at least one of 
-	PORTAGE_ELOG_CLASSES="info warn error log"
+	PORTAGE_ELOG_CLASSES="info warn error log qa"
 and
 	PORTAGE_ELOG_SYSTEM="save"
 in /etc/make.conf
@@ -97,10 +97,10 @@
 
 
 
-filter = {'INFO': True, 'WARN': True, 'ERROR': True, 'LOG': True,
+filter = {'INFO': True, 'WARN': True, 'ERROR': True, 'LOG': True, 'QA': True,
 		'preinst': True, 'postinst': True, 'prerm': True, 'postrm': True,
 		'unpack': True, 'compile': True, 'setup': True, 'test': True,
-		'install': True, 'other': True}
+		'install': True, 'prepare':True, 'configure':True, 'other': True}
 
 
 class MainWindow (gtk.Window):
@@ -129,6 +129,8 @@
 		otime = '%x %X'
 		vtime = '%Y-%m-%d %H:%M:%S'
 
+		self.filename = filename
+		filename = filename.replace('/',':',1)
 		(c, p, t) = filename.split(':')
 		t = time.strptime(t, itime)
 		st = time.strftime(vtime, t)
@@ -138,7 +140,6 @@
 		self.package = p
 		self.timestamp = st
 		self.timesort = t
-		self.filename = filename
 
 
 from glob import glob
@@ -169,7 +170,7 @@
 
 	def populate(self):
 		self.clear()
-		for e in [Elog(filename) for filename in glob('*:*:*.log')]:
+		for e in [Elog(filename) for filename in glob('*:*:*.log') + glob('*/*:*.log')]:
 			iter = self.get_iter_for(e.category)
 			if not iter:
 				# New category
@@ -181,7 +182,7 @@
 	def populate_flat(self):
 		self.clear()
 		iter = self.get_iter_first()
-		for e in [Elog(filename) for filename in glob('*:*:*.log')]:
+		for e in [Elog(filename) for filename in glob('*:*:*.log') + glob('*/*:*.log')]:
 			self.append(iter,
 					(e.category, e.package, e.timestamp, e.timesort, e.filename))
 
@@ -275,29 +276,32 @@
 class HeaderTable(Table):
 
 	def __init__(self):
-		Table.__init__(self, 2, 2)
+		Table.__init__(self, 2, 3)
 
 		btn_info = CheckButton('INFO')
 		btn_warn = CheckButton('WARN')
 		btn_error = CheckButton('ERROR')
 		btn_log = CheckButton('LOG')
+		btn_qa = CheckButton('QA')
 
 		self.attach(btn_info,  0, 1, 0, 1)
 		self.attach(btn_warn,  1, 2, 0, 1)
 		self.attach(btn_error, 0, 1, 1, 2)
 		self.attach(btn_log,   1, 2, 1, 2)
+		self.attach(btn_qa,    0, 1, 2, 3)
 
 		# public
 		self.btn_info = btn_info
 		self.btn_warn = btn_warn
 		self.btn_error = btn_error
 		self.btn_log = btn_log
+		self.btn_qa = btn_qa
 
 
 class StageTable(Table):
 
 	def __init__(self):
-		Table.__init__(self, 2, 5)
+		Table.__init__(self, 2, 6)
 
 		btn_preinst = CheckButton('preinst')
 		btn_postinst = CheckButton('postinst')
@@ -308,18 +312,22 @@
 		btn_setup = CheckButton('setup')
 		btn_test = CheckButton('test')
 		btn_install = CheckButton('install')
+		btn_prepare = CheckButton('prepare')
+		btn_configure = CheckButton('configure')
 		btn_other = CheckButton('other')
 
-		self.attach(btn_preinst,  0, 1, 0, 1)
-		self.attach(btn_postinst, 1, 2, 0, 1)
-		self.attach(btn_prerm,    0, 1, 1, 2)
-		self.attach(btn_postrm,   1, 2, 1, 2)
-		self.attach(btn_unpack,   0, 1, 2, 3)
-		self.attach(btn_compile,  1, 2, 2, 3)
-		self.attach(btn_setup,    0, 1, 3, 4)
-		self.attach(btn_test,     1, 2, 3, 4)
-		self.attach(btn_install,  0, 1, 4, 5)
-		self.attach(btn_other,    1, 2, 4, 5)
+		self.attach(btn_preinst,   0, 1, 0, 1)
+		self.attach(btn_postinst,  1, 2, 0, 1)
+		self.attach(btn_prerm,     0, 1, 1, 2)
+		self.attach(btn_postrm,    1, 2, 1, 2)
+		self.attach(btn_unpack,    0, 1, 2, 3)
+		self.attach(btn_compile,   1, 2, 2, 3)
+		self.attach(btn_setup,     0, 1, 3, 4)
+		self.attach(btn_test,      1, 2, 3, 4)
+		self.attach(btn_install,   0, 1, 4, 5)
+		self.attach(btn_prepare,   1, 2, 4, 5)
+		self.attach(btn_configure, 0, 1, 5, 6)
+		self.attach(btn_other,     1, 2, 5, 6)
 
 		# public
 		self.btn_preinst = btn_preinst
@@ -331,6 +339,8 @@
 		self.btn_setup = btn_setup
 		self.btn_test = btn_test
 		self.btn_install = btn_install
+		self.btn_prepare = btn_prepare
+		self.btn_configure = btn_configure
 		self.btn_other = btn_other
 
 class ViewSelector(gtk.HBox):
@@ -352,6 +362,7 @@
 		self.create_tag('WARN', foreground='red')
 		self.create_tag('LOG', foreground='black')
 		self.create_tag('ERROR', foreground='orange')
+		self.create_tag('QA', foreground='blue')
 
 
 class Buffer(TextBuffer):
@@ -597,6 +608,7 @@
 		f_header.btn_warn.connect('toggled', self.filter)
 		f_header.btn_error.connect('toggled', self.filter)
 		f_header.btn_log.connect('toggled', self.filter)
+		f_header.btn_qa.connect('toggled', self.filter)
 		
 		f_stage.btn_preinst.connect('toggled', self.filter)
 		f_stage.btn_postinst.connect('toggled', self.filter)
@@ -607,6 +619,8 @@
 		f_stage.btn_setup.connect('toggled', self.filter)
 		f_stage.btn_test.connect('toggled', self.filter)
 		f_stage.btn_install.connect('toggled', self.filter)
+		f_stage.btn_prepare.connect('toggled', self.filter)
+		f_stage.btn_configure.connect('toggled', self.filter)
 		f_stage.btn_other.connect('toggled', self.filter)
 
 		# public