|
|
|
@ -341,7 +341,7 @@ class Builder(Update):
|
|
|
|
|
else:
|
|
|
|
|
return True
|
|
|
|
|
else:
|
|
|
|
|
self.printSUCCESS("Nothing to merge")
|
|
|
|
|
self.printSUCCESS(_("Nothing to merge"))
|
|
|
|
|
except EmergeError as e:
|
|
|
|
|
self.set_need_update(False)
|
|
|
|
|
self.emerge_cache.drop_cache("Emerge error")
|
|
|
|
@ -373,7 +373,7 @@ class Builder(Update):
|
|
|
|
|
return True
|
|
|
|
|
self._startEmerging(emerge)
|
|
|
|
|
else:
|
|
|
|
|
self.printSUCCESS("Nothing to unmerge")
|
|
|
|
|
self.printSUCCESS(_("Nothing to unmerge"))
|
|
|
|
|
except EmergeError:
|
|
|
|
|
self._display_error(emerge.prepare_error)
|
|
|
|
|
raise
|
|
|
|
|