diff options
| author |   Marius Mauch <genone@gentoo.org> | 2008-02-10 13:01:43 +0000 |
|---|---|---|
| committer | Marius Mauch <genone@gentoo.org> | 2008-02-10 13:01:43 +0000 |
| commit | 5a5a3db5b81b6eff0a3f5dc3fdcb5b8e49931bd9 (patch) | |
| tree | 52ccda1d260846eacd88c8bfdf19f731ff9b2e4b | |
| parent | Remove the killparent() function and associated SIGINT trap since this (diff) | |
| download | portage-5a5a3db5b81b6eff0a3f5dc3fdcb5b8e49931bd9.tar.gz portage-5a5a3db5b81b6eff0a3f5dc3fdcb5b8e49931bd9.tar.bz2 portage-5a5a3db5b81b6eff0a3f5dc3fdcb5b8e49931bd9.zip | |
fix more trivial issues breaking repomanv2.2_pre2
svn path=/main/trunk/; revision=9328
| -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 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... |