diff options
Diffstat (limited to 'pym/repoman/utilities.py')
| -rw-r--r-- | pym/repoman/utilities.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py index beabd9d4..379e47e6 100644 --- a/pym/repoman/utilities.py +++ b/pym/repoman/utilities.py @@ -13,13 +13,14 @@ import os import sys from portage import output +from portage.output import red, green from portage import exception from portage import util normalize_path = util.normalize_path util.initialize_logger() -def detect_vcs_conflicts(vcs, options): +def detect_vcs_conflicts(options, vcs): """Determine if the checkout has problems like cvs conflicts. If you want more vcs support here just keep adding if blocks... |