|
|
|
@ -335,6 +335,8 @@ class Builder(Update):
|
|
|
|
|
emergelike = self.clVars.Get(
|
|
|
|
|
'update.cl_update_emergelist_set') == 'on'
|
|
|
|
|
self._display_install_package(emerge, emergelike)
|
|
|
|
|
if emerge.skipped_packages:
|
|
|
|
|
self._display_error(emerge.skipped_packages)
|
|
|
|
|
if not pretend:
|
|
|
|
|
answer = self.askConfirm(
|
|
|
|
|
_("Would you like to merge these packages?"), "yes")
|
|
|
|
@ -346,8 +348,8 @@ class Builder(Update):
|
|
|
|
|
else:
|
|
|
|
|
self.printSUCCESS(_("Nothing to merge"))
|
|
|
|
|
except EmergeError as e:
|
|
|
|
|
self.set_need_update(False)
|
|
|
|
|
self.emerge_cache.drop_cache("Emerge error")
|
|
|
|
|
#self.set_need_update(False)
|
|
|
|
|
#self.emerge_cache.drop_cache("Emerge error")
|
|
|
|
|
self._display_install_package(emerge, emergelike=True)
|
|
|
|
|
self._display_error(emerge.prepare_error)
|
|
|
|
|
raise
|
|
|
|
|