cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

try to display warnings at a smarter time

Browse Source
This commit is contained in:
guinux 2013-05-19 11:20:23 +02:00
parent 175445aaa3
commit c50d0e8c7f
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pamac-daemon.py
View File

@ -67,12 +67,20 @@ class PamacDBusService(dbus.service.Object):
if ID is 1: if ID is 1:
self.action = _('Checking dependencies')+'...' self.action = _('Checking dependencies')+'...'
self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png' self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
elif ID is 2:
if self.warning:
self.EmitLogWarning(self.warning)
self.warning = ''
elif ID is 3: elif ID is 3:
self.action = _('Checking file conflicts')+'...' self.action = _('Checking file conflicts')+'...'
self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png' self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
elif ID is 5: elif ID is 5:
self.action = _('Resolving dependencies')+'...' self.action = _('Resolving dependencies')+'...'
self.icon = '/usr/share/pamac/icons/24x24/status/setup.png' self.icon = '/usr/share/pamac/icons/24x24/status/setup.png'
elif ID is 6:
if self.warning:
self.EmitLogWarning(self.warning)
self.warning = ''
elif ID is 7: elif ID is 7:
self.action = _('Checking inter conflicts')+'...' self.action = _('Checking inter conflicts')+'...'
self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png' self.icon = '/usr/share/pamac/icons/24x24/status/package-search.png'
@ -152,13 +160,13 @@ class PamacDBusService(dbus.service.Object):
if not (level & _logmask): if not (level & _logmask):
return return
if level & pyalpm.LOG_ERROR: if level & pyalpm.LOG_ERROR:
#self.error += "ERROR: "+line self.error += "ERROR: "+line
self.EmitLogError(line) #self.EmitLogError(line)
#print(self.error) print(self.error)
#self.t.release() #self.t.release()
elif level & pyalpm.LOG_WARNING: elif level & pyalpm.LOG_WARNING:
#self.warning += "WARNING: "+line self.warning += "WARNING: "+line
self.EmitLogWarning(line) #self.EmitLogWarning(line)
elif level & pyalpm.LOG_DEBUG: elif level & pyalpm.LOG_DEBUG:
line = "DEBUG: " + line line = "DEBUG: " + line
print(line) print(line)
@ -424,6 +432,9 @@ class PamacDBusService(dbus.service.Object):
#pass #pass
finally: finally:
self.CheckUpdates() self.CheckUpdates()
if self.warning:
self.EmitLogWarning(self.warning)
self.warning = ''
if self.error: if self.error:
self.EmitTransactionError(self.error) self.EmitTransactionError(self.error)
else: else: