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

little fixes

Browse Source
This commit is contained in:
guinux
2013-09-29 11:49:42 +02:00
parent c7735f173d
commit edfb2e9b86
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pamac/transaction.py
View File

@@ -328,10 +328,10 @@ class Transaction():
if event == 'ALPM_QUESTION_INSTALL_IGNOREPKG':
return 0 #Do not install package in IgnorePkg/IgnoreGroup
if event == 'ALPM_QUESTION_REPLACE_PKG':
self.warning += _('{pkgname1} will replace by {pkgname2}\n').format(pkgname1 = data_tupel[0].name, pkgname2 = data_tupel[1].name)
self.warning += _('{pkgname1} will be replaced by {pkgname2}').format(pkgname1 = data_tupel[0].name, pkgname2 = data_tupel[1].name)+'\n'
return 1 #Auto-remove conflicts in case of replaces
if event == 'ALPM_QUESTION_CONFLICT_PKG':
self.warning += _('{pkgname1} conflicts with {pkgname2}\n').format(pkgname1 = data_tupel[0], pkgname2 = data_tupel[1])
self.warning += _('{pkgname1} conflicts with {pkgname2}').format(pkgname1 = data_tupel[0], pkgname2 = data_tupel[1])+'\n'
return 1 #Auto-remove conflicts
if event == 'ALPM_QUESTION_CORRUPTED_PKG':
return 1 #Auto-remove corrupted pkgs in cache
@@ -352,7 +352,7 @@ class Transaction():
if not (level & _logmask):
return
if level & pyalpm.LOG_ERROR:
self.error += line
#self.error += line
_error = "ERROR: "+line
end_iter = progress_buffer.get_end_iter()
progress_buffer.insert(end_iter, _error)