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

["Brian Dolbec" <dolsen@gentoo.org>]

commit:     208df494effc8710c60e1d9d8bc2b81980eb1a99
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 17 18:54:06 2015 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Thu Sep 17 18:54:06 2015 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=208df494

repoman/main.py: Clean out demarcation lines

Remove the lines added during the initial code splitting to mark the places
where code chunks were removed.
Clean out some extra line spacing.

Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 pym/repoman/main.py | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pym/repoman/main.py b/pym/repoman/main.py
index 8ad3a1f..740ca63 100755
--- a/pym/repoman/main.py
+++ b/pym/repoman/main.py
@@ -62,10 +62,8 @@ if sys.hexversion >= 0x3000000:
 
 util.initialize_logger()
 
-
 bad = create_color_func("BAD")
 
-
 # A sane umask is needed for files that portage creates.
 os.umask(0o22)
 
@@ -102,22 +100,14 @@ def repoman_main(argv):
 
 	myreporoot = os.path.basename(portdir_overlay)
 	myreporoot += mydir[len(portdir_overlay):]
-	##################
 
 	vcs_settings = VCSSettings(options, repoman_settings)
 
-
-	##################
-
 	repo_settings = RepoSettings(
 		config_root, portdir, portdir_overlay,
 		repoman_settings, vcs_settings, options, qawarnings)
-
 	repoman_settings = repo_settings.repoman_settings
-
 	portdb = repo_settings.portdb
-	##################
-
 
 	if 'digest' in repoman_settings.features and options.digest != 'n':
 		options.digest = 'y'
@@ -131,14 +121,12 @@ def repoman_main(argv):
 	env = os.environ.copy()
 	env['FEATURES'] = env.get('FEATURES', '') + ' -unknown-features-warn'
 
-######################
-# cut out the main checks loop here
-
+	# Perform the main checks
 	scanner = Scanner(repo_settings, myreporoot, config_root, options,
 					vcs_settings, mydir, can_force, env)
 	qatracker = scanner.scan()
+	# reset can_force from scanner in case there was a change
 	can_force = scanner.can_force
-######################
 
 	commitmessage = None
 
@@ -152,6 +140,7 @@ def repoman_main(argv):
 	# dofull will be true if we should print a "repoman full" informational message
 	dofull = options.mode != 'full'
 
+	# early out for manifest generation
 	if options.mode == "manifest":
 		sys.exit(dofail)