diff options
| -rw-r--r-- | sys-apps/pkgcore/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch | 22 |
2 files changed, 27 insertions, 1 deletions
diff --git a/sys-apps/pkgcore/ChangeLog b/sys-apps/pkgcore/ChangeLog index 6d4e6fa7974d..180b60481f9b 100644 --- a/sys-apps/pkgcore/ChangeLog +++ b/sys-apps/pkgcore/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/pkgcore # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.39 2007/06/28 07:20:34 tsunam Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/pkgcore/ChangeLog,v 1.40 2007/06/28 08:12:37 tsunam Exp $ + + 28 Jun 2007; Joshua Jackson <tsunam@gentoo.org> + +files/pkgcore-0.3.1-pmerge-unmerge-ask.patch: + Forgot the patch bumpage as well *pkgcore-0.3.1 (28 Jun 2007) diff --git a/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch b/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch new file mode 100644 index 000000000000..541be270a5bd --- /dev/null +++ b/sys-apps/pkgcore/files/pkgcore-0.3.1-pmerge-unmerge-ask.patch @@ -0,0 +1,22 @@ +=== modified file 'pkgcore/scripts/pmerge.py' +--- pkgcore/scripts/pmerge.py 2007-06-06 21:01:31 +0000 ++++ pkgcore/scripts/pmerge.py 2007-06-06 21:03:03 +0000 +@@ -174,7 +174,7 @@ + """Raised internally to indicate an "expected" failure condition.""" + + +-def unmerge(out, err, vdb, tokens, options, world_set=None): ++def unmerge(out, err, vdb, tokens, options, formatter, world_set=None): + """Unmerge tokens. hackish, should be rolled back into the resolver""" + all_matches = set() + for token in tokens: +@@ -311,7 +311,7 @@ + return 1 + try: + unmerge( +- out, err, vdb, options.targets, options, world_set) ++ out, err, vdb, options.targets, options, formatter, world_set) + except (parserestrict.ParseError, Failure), e: + out.error(str(e)) + return 1 + |