fix more trivial issues breaking repoman

svn path=/main/trunk/; revision=9328

diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index beabd9d47dd2802bf284e6280b549debcdac2df3..379e47e6d9b9619a0645020f54e2402aa9efe0a2 100644 (file)
--- 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...