Fix two small issues

svn path=/main/branches/prefix/; revision=9233

diff --git a/bin/repoman b/bin/repoman
index fc987d43ce950917666377996a02f573d3dbb9f4..950d9644567d1922163f35ae361c82131fac3910 100755 (executable)
--- a/bin/repoman
+++ b/bin/repoman
@@ -656,7 +656,7 @@ else:
        xmllint_capable=True
 
 if options.mode == 'commit' and isVcs:
-       utilities.detect_vcs_conflicts(options, vcs=vcs)
+       utilities.detect_vcs_conflicts(options, vcs)
 
 if options.mode == "manifest":
        pass
@@ -666,7 +666,7 @@ else:
        print green("\nRepoMan scours the neighborhood...")
 
 new_ebuilds = set()
-if isCvs:
+if vcs == "cvs":
        mycvstree = cvstree.getentries("./", recursive=1)
        mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./")
        new_ebuilds.update(x for x in mynew if x.endswith(".ebuild"))