From: Marius Mauch <genone@gentoo.org>
Date: Sun, 10 Feb 2008 13:01:43 +0000 (-0000)
Subject: fix more trivial issues breaking repoman
X-Git-Tag: v2.2_pre2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5a5a3db5b81b6eff0a3f5dc3fdcb5b8e49931bd9;p=portage.git

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 beabd9d47..379e47e6d 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...