| 1 |
commit: bff7a405f648ee1fbaad46933558f31bcd3c15fa |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Dec 29 21:14:13 2015 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 29 21:18:27 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=bff7a405 |
| 7 |
|
| 8 |
emaint/.../merges: Rename --purge-tracker option due to bug 562652 |
| 9 |
|
| 10 |
Renaming the long option back to --purge, fixes it to work correctly. |
| 11 |
Due to the structure of the plugin-system, it may need some re-wrok to handle hyphenated long options correctly. |
| 12 |
|
| 13 |
X-Gentoo-Bug: 562652 |
| 14 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=562652 |
| 15 |
|
| 16 |
pym/portage/emaint/modules/merges/__init__.py | 2 +- |
| 17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/emaint/modules/merges/__init__.py b/pym/portage/emaint/modules/merges/__init__.py |
| 20 |
index bcb2ac8..211b7eb 100644 |
| 21 |
--- a/pym/portage/emaint/modules/merges/__init__.py |
| 22 |
+++ b/pym/portage/emaint/modules/merges/__init__.py |
| 23 |
@@ -16,7 +16,7 @@ module_spec = { |
| 24 |
'functions': ['check', 'fix', 'purge'], |
| 25 |
'func_desc': { |
| 26 |
'purge': { |
| 27 |
- 'short': '-P', 'long': '--purge-tracker', |
| 28 |
+ 'short': '-P', 'long': '--purge', |
| 29 |
'help': 'Removes the list of previously failed merges.' + |
| 30 |
' WARNING: Only use this option if you plan on' + |
| 31 |
' manually fixing them or do not want them' |
Archives