Re: [gentoo-portage-dev] [PATCH 3/3] Add an emaint module that can scan for failed merges and that can fix failed merges.

On Thu, Mar 13, 2014 at 3:09 PM, Alec Warner wrote: > > > > On Wed, Mar 12, 2014 at 11:10 PM, Pavel Kazakov wrote: > >> --- >> pym/portage/emaint/main.py| 6 +- >> pym/portage/emaint/modules/merges/__init__.py | 30 +++ >> pym/portage/emaint/modules/merges/merges.py | 28

Re: [gentoo-portage-dev] [PATCH 3/3] Add an emaint module that can scan for failed merges and that can fix failed merges.

On Wed, Mar 12, 2014 at 11:10 PM, Pavel Kazakov wrote: > --- > pym/portage/emaint/main.py| 6 +- > pym/portage/emaint/modules/merges/__init__.py | 30 +++ > pym/portage/emaint/modules/merges/merges.py | 281 > ++ > 3 files changed, 315 insertions(+

Re: [gentoo-portage-dev] [PATCH 1/3] Move -MERGING- string to a constant variable.

On 03/12/14 23:10, Pavel Kazakov wrote: > --- > pym/portage/const.py | 1 + > pym/portage/dbapi/__init__.py | 4 +++- > pym/portage/dbapi/vartree.py | 8 > 3 files changed, 8 insertions(+), 5 deletions(-) ... > @@ -1504,7 +1504,7 @@ class dblink(object): > self.dbr