aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-12-29 13:14:13 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-12-29 13:18:27 -0800
commitbff7a405f648ee1fbaad46933558f31bcd3c15fa (patch)
tree1ea0a7a92aa42d2e487c8f8bd7f947e77abfa6e3
parentrepoman: fix KeyError triggered by fetch failure during manifest generation (... (diff)
downloadportage-bff7a405.tar.gz
portage-bff7a405.tar.bz2
portage-bff7a405.zip
emaint/.../merges: Rename --purge-tracker option due to bug 562652
Renaming the long option back to --purge, fixes it to work correctly. Due to the structure of the plugin-system, it may need some re-wrok to handle hyphenated long options correctly. X-Gentoo-Bug: 562652 X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=562652
-rw-r--r--pym/portage/emaint/modules/merges/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pym/portage/emaint/modules/merges/__init__.py b/pym/portage/emaint/modules/merges/__init__.py
index bcb2ac8ee..211b7eba3 100644
--- a/pym/portage/emaint/modules/merges/__init__.py
+++ b/pym/portage/emaint/modules/merges/__init__.py
@@ -16,7 +16,7 @@ module_spec = {
'functions': ['check', 'fix', 'purge'],
'func_desc': {
'purge': {
- 'short': '-P', 'long': '--purge-tracker',
+ 'short': '-P', 'long': '--purge',
'help': 'Removes the list of previously failed merges.' +
' WARNING: Only use this option if you plan on' +
' manually fixing them or do not want them'