[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     bb73c4c47dc6372d239caa1d4b77769ea916ee33
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Sep  5 21:47:34 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=bb73c4c4

repoman: Fix up commit imports and calls

 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
 import sys
 
 import portage
+from portage import util
 from portage.util._argparse import ArgumentParser
 
 def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 5aa6ad8..31d2b77 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1282,7 +1283,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if (not commitmessage or not commitmessage.strip()
 				or commitmessage.strip() == msg_prefix):
 			print("* no commit message?  aborting commit.")
@@ -1343,7 +1345,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1483,7 +1486,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1637,9 +1640,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1653,7 +1656,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     6d581c242cdbbac0cf86c5ac1e653cb326a9e3b4
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 03:06:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=6d581c24

repoman: Fix up commit imports and calls

 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
 import sys
 
 import portage
+from portage import util
 from portage.util._argparse import ArgumentParser
 
 def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 5aa6ad8..31d2b77 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1282,7 +1283,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if (not commitmessage or not commitmessage.strip()
 				or commitmessage.strip() == msg_prefix):
 			print("* no commit message?  aborting commit.")
@@ -1343,7 +1345,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1483,7 +1486,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1637,9 +1640,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1653,7 +1656,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     318499e7ea1a4bc61344c0bb95264ddee8f00a00
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 11 23:52:51 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=318499e7

repoman: Fix up commit imports and calls

 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
 import sys
 
 import portage
+from portage import util
 from portage.util._argparse import ArgumentParser
 
 def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 57b5b40..c75657e 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1278,7 +1279,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if (not commitmessage or not commitmessage.strip()
 				or commitmessage.strip() == msg_prefix):
 			print("* no commit message?  aborting commit.")
@@ -1339,7 +1341,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1479,7 +1482,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1633,9 +1636,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1649,7 +1652,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Michał Górny]

commit:     19c2dea02049950720ac0c6efea81f0819314138
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 14:45:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=19c2dea0

repoman: Fix up commit imports and calls

 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
 import sys
 
 import portage
+from portage import util
 from portage.util._argparse import ArgumentParser
 
 def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 57b5b40..c75657e 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1278,7 +1279,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if (not commitmessage or not commitmessage.strip()
 				or commitmessage.strip() == msg_prefix):
 			print("* no commit message?  aborting commit.")
@@ -1339,7 +1341,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1479,7 +1482,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1633,9 +1636,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1649,7 +1652,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     230f8a0bb92992b60eef5f264ec0b0ed907da1d7
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 05:47:25 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=230f8a0b

repoman: Fix up commit imports and calls

 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 5378e36..45f65fd 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -8,6 +8,7 @@ import logging
 import sys
 
 import portage
+from portage import util
 from portage.util._argparse import ArgumentParser
 
 def parse_args(argv, qahelp, repoman_default_opts):
@@ -176,7 +177,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 469103e..2123e4b 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -59,7 +59,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -190,8 +190,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -268,7 +268,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1274,7 +1275,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if not commitmessage or not commitmessage.strip():
 			print("* no commit message?  aborting commit.")
 			sys.exit(1)
@@ -1334,7 +1336,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1474,7 +1477,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1628,9 +1631,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1644,7 +1647,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     5ac501632bd8a8747d6164517e8e48124fdd5239
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Mon Nov 17 00:53:12 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=5ac50163

repoman: Fix up commit imports and calls

---
 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 19ec6e9..393d755 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -6,6 +6,7 @@
 
 import logging
 import portage
+import sys
 from portage import util
 from portage.util._argparse import ArgumentParser
 
@@ -167,7 +168,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 9ce3c18..d567f94 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -56,7 +56,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -187,8 +187,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -265,7 +265,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1266,7 +1267,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if not commitmessage or not commitmessage.strip():
 			print("* no commit message?  aborting commit.")
 			sys.exit(1)
@@ -1326,7 +1328,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1466,7 +1469,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1621,9 +1624,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1637,7 +1640,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     8fcbc2c7244dfa53008501df760efdfbf48ef999
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 23:45:33 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=8fcbc2c7

repoman: Fix up commit imports and calls

---
 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 19ec6e9..393d755 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -6,6 +6,7 @@
 
 import logging
 import portage
+import sys
 from portage import util
 from portage.util._argparse import ArgumentParser
 
@@ -167,7 +168,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 9ce3c18..d567f94 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -56,7 +56,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -187,8 +187,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -265,7 +265,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1266,7 +1267,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if not commitmessage or not commitmessage.strip():
 			print("* no commit message?  aborting commit.")
 			sys.exit(1)
@@ -1326,7 +1328,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1466,7 +1469,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1621,9 +1624,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1637,7 +1640,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/commit/, pym/repoman/

[Brian Dolbec]

commit:     206c4ea10d15ec3d0187ab67a49363f96eed9085
Author:     Tom Wijsman <tomwij <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  2 18:28:34 2014 +0000
Commit:     Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
CommitDate: Wed Oct  1 22:57:17 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=206c4ea1

repoman: Fix up commit imports and calls

---
 pym/repoman/argparser.py                 |  3 ++-
 pym/repoman/copyrights.py                |  2 +-
 pym/repoman/main.py                      | 24 ++++++++++++++----------
 pym/repoman/modules/commit/repochecks.py |  3 ++-
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/pym/repoman/argparser.py b/pym/repoman/argparser.py
index 19ec6e9..393d755 100644
--- a/pym/repoman/argparser.py
+++ b/pym/repoman/argparser.py
@@ -6,6 +6,7 @@
 
 import logging
 import portage
+import sys
 from portage import util
 from portage.util._argparse import ArgumentParser
 
@@ -167,7 +168,7 @@ def parse_args(argv, qahelp, repoman_default_opts):
 	opts, args = parser.parse_known_args(argv[1:])
 
 	if not opts.ignore_default_opts:
-		default_opts = portage.util.shlex_split(repoman_default_opts)
+		default_opts = util.shlex_split(repoman_default_opts)
 		if default_opts:
 			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
 

diff --git a/pym/repoman/copyrights.py b/pym/repoman/copyrights.py
index 231857f..01ce42f 100644
--- a/pym/repoman/copyrights.py
+++ b/pym/repoman/copyrights.py
@@ -83,7 +83,7 @@ def update_copyright(fn_path, year, pretend=False):
 			new_header.append(line)
 			break
 
-		line = _update_copyright_year(year, line)
+		line = update_copyright_year(year, line)
 		new_header.append(line)
 
 	difflines = 0

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 9ce3c18..d567f94 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -56,7 +56,7 @@ from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
 from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
 from repoman.ebuild import Ebuild
 from repoman.errors import err
-from repoman.modules import commit
+from repoman.modules.commit import repochecks
 from repoman.profile import check_profiles, dev_keywords, setup_profile
 from repoman.qa_data import (format_qa_output, format_qa_output_column, qahelp,
 	qawarnings, qacats, max_desc_len, missingvars,
@@ -187,8 +187,8 @@ repolevel = len(reposplit)
 ###################
 
 if options.mode == 'commit':
-	commit.repochecks.commit_check(repolevel, reposplit)
-	commit.repochecks.conflict_check(vcs_settings, options)
+	repochecks.commit_check(repolevel, reposplit)
+	repochecks.conflict_check(vcs_settings, options)
 
 ###################
 
@@ -265,7 +265,8 @@ check_ebuild_notadded = not \
 effective_scanlist = scanlist
 if options.if_modified == "y":
 	effective_scanlist = sorted(vcs_files_to_cps(
-		chain(changed.changed, changed.new, changed.removed)))
+		chain(changed.changed, changed.new, changed.removed),
+		repolevel, reposplit, categories))
 
 for xpkg in effective_scanlist:
 	# ebuilds and digests added to cvs respectively.
@@ -1266,7 +1267,8 @@ else:
 			else:
 				commitmessage = utilities.get_commit_message_with_stdin()
 		except KeyboardInterrupt:
-			exithandler()
+			logging.fatal("Interrupted; exiting...")
+			sys.exit(1)
 		if not commitmessage or not commitmessage.strip():
 			print("* no commit message?  aborting commit.")
 			sys.exit(1)
@@ -1326,7 +1328,8 @@ else:
 		logging.info("checking for unmodified ChangeLog files")
 		committer_name = utilities.get_committer_name(env=repoman_settings)
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, mymanifests, myremoved))):
+			chain(myupdates, mymanifests, myremoved),
+			repolevel, reposplit, categories)):
 			catdir, pkgdir = x.split("/")
 			checkdir = repo_settings.repodir + "/" + x
 			checkdir_relative = ""
@@ -1466,7 +1469,7 @@ else:
 
 		print("%s have headers that will change." % green(str(len(myheaders))))
 		print(
-			"* Files with headers will "
+			"* Files with headers will"
 			" cause the manifests to be changed and committed separately.")
 
 	logging.info("myupdates: %s", myupdates)
@@ -1621,9 +1624,9 @@ else:
 			"doing the entire repository.\"\n")
 
 	if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-
 		for x in sorted(vcs_files_to_cps(
-			chain(myupdates, myremoved, mymanifests))):
+			chain(myupdates, myremoved, mymanifests),
+			repolevel, reposplit, categories)):
 			repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 			digestgen(mysettings=repoman_settings, myportdb=portdb)
 
@@ -1637,7 +1640,8 @@ else:
 		signed = True
 		try:
 			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests))):
+				chain(myupdates, myremoved, mymanifests),
+				repolevel, reposplit, categories)):
 				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
 				manifest_path = os.path.join(repoman_settings["O"], "Manifest")
 				if not need_signature(manifest_path):

diff --git a/pym/repoman/modules/commit/repochecks.py b/pym/repoman/modules/commit/repochecks.py
index ac4db6b..d0e2f28 100644
--- a/pym/repoman/modules/commit/repochecks.py
+++ b/pym/repoman/modules/commit/repochecks.py
@@ -3,7 +3,8 @@
 from portage.output import red
 
 from repoman.errors import err
-from repoman.vcs import detect_vcs_conflicts
+from repoman.vcs import vcs
+from repoman.vcs.vcs import detect_vcs_conflicts
 
 
 def commit_check(repolevel, reposplit):