| 1 |
Author: genone |
| 2 |
Date: 2008-02-10 13:01:43 +0000 (Sun, 10 Feb 2008) |
| 3 |
New Revision: 9328 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/repoman/utilities.py |
| 7 |
Log: |
| 8 |
fix more trivial issues breaking repoman |
| 9 |
|
| 10 |
Modified: main/trunk/pym/repoman/utilities.py |
| 11 |
=================================================================== |
| 12 |
--- main/trunk/pym/repoman/utilities.py 2008-02-10 07:18:58 UTC (rev 9327) |
| 13 |
+++ main/trunk/pym/repoman/utilities.py 2008-02-10 13:01:43 UTC (rev 9328) |
| 14 |
@@ -13,13 +13,14 @@ |
| 15 |
import sys |
| 16 |
|
| 17 |
from portage import output |
| 18 |
+from portage.output import red, green |
| 19 |
from portage import exception |
| 20 |
from portage import util |
| 21 |
normalize_path = util.normalize_path |
| 22 |
util.initialize_logger() |
| 23 |
|
| 24 |
|
| 25 |
-def detect_vcs_conflicts(vcs, options): |
| 26 |
+def detect_vcs_conflicts(options, vcs): |
| 27 |
"""Determine if the checkout has problems like cvs conflicts. |
| 28 |
|
| 29 |
If you want more vcs support here just keep adding if blocks... |
| 30 |
|
| 31 |
-- |
| 32 |
gentoo-commits@l.g.o mailing list |
Archives