public inbox for gentoo-catalyst@lists.gentoo.org
 help / color / mirror / Atom feed
From: Mike Frysinger <vapier@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Subject: [gentoo-catalyst] [PATCH 06/10] support: convert to log module
Date: Sun, 11 Oct 2015 02:29:08 -0400	[thread overview]
Message-ID: <1444544952-32408-6-git-send-email-vapier@gentoo.org> (raw)
In-Reply-To: <1444544952-32408-1-git-send-email-vapier@gentoo.org>

---
 catalyst/support.py | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/catalyst/support.py b/catalyst/support.py
index 6b1e727..8883acb 100644
--- a/catalyst/support.py
+++ b/catalyst/support.py
@@ -4,10 +4,10 @@ import sys
 import os
 import types
 import re
-import traceback
 import time
 from subprocess import Popen
 
+from catalyst import log
 from catalyst.defaults import valid_config_file_values
 
 BASH_BINARY             = "/bin/bash"
@@ -29,21 +29,13 @@ def list_bashify(mylist):
 class CatalystError(Exception):
 	def __init__(self, message, print_traceback=False):
 		if message:
-			if print_traceback:
-				(_type, value) = sys.exc_info()[:2]
-				if value!=None:
-					print
-					print "Traceback values found.  listing..."
-					print traceback.print_exc(file=sys.stdout)
-			print
-			print "!!! catalyst: "+message
-			print
+			log.error('CatalystError: %s', message, exc_info=print_traceback)
 
 
 def cmd(mycmd, myexc="", env=None, debug=False, fail_func=None):
 	if env is None:
 		env = {}
-	#print "***** cmd()"
+	log.debug('cmd: %r', mycmd)
 	sys.stdout.flush()
 	args=[BASH_BINARY]
 	if "BASH_ENV" not in env:
@@ -54,12 +46,11 @@ def cmd(mycmd, myexc="", env=None, debug=False, fail_func=None):
 	args.append("-c")
 	args.append(mycmd)
 
-	if debug:
-		print "***** cmd(); args =", args
+	log.debug('args: %r', args)
 	proc = Popen(args, env=env)
 	if proc.wait() != 0:
 		if fail_func:
-			print "CMD(), NON-Zero command return.  Running fail_func()"
+			log.error('CMD(), NON-Zero command return.  Running fail_func().')
 			fail_func()
 		raise CatalystError("cmd() NON-zero return value from: %s" % myexc,
 			print_traceback=False)
@@ -223,15 +214,17 @@ def addl_arg_parse(myspec,addlargs,requiredspec,validspec):
 
 def countdown(secs=5, doing="Starting"):
 	if secs:
-		print ">>> Waiting",secs,"seconds before starting..."
-		print ">>> (Control-C to abort)...\n"+doing+" in: ",
+		sys.stdout.write(
+			('>>> Waiting %s seconds before starting...\n'
+			 '>>> (Control-C to abort)...\n'
+			 '%s in: ') % (secs, doing))
 		ticks=range(secs)
 		ticks.reverse()
 		for sec in ticks:
 			sys.stdout.write(str(sec+1)+" ")
 			sys.stdout.flush()
 			time.sleep(1)
-		print
+		sys.stdout.write('\n')
 
 
 def normpath(mypath):
-- 
2.5.2



  parent reply	other threads:[~2015-10-11  6:29 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-11  6:29 [gentoo-catalyst] [PATCH 01/10] stage1: convert to log module Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 02/10] stage2: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 03/10] stage3: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 04/10] stagebase: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 05/10] clearbase: " Mike Frysinger
2015-10-11  6:29 ` Mike Frysinger [this message]
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 07/10] livecd_stage: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 08/10] netboot: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 09/10] embedded/grp: " Mike Frysinger
2015-10-11  6:29 ` [gentoo-catalyst] [PATCH 10/10] resume: " Mike Frysinger
2015-10-11 14:16   ` Anthony G. Basile
2015-10-11 17:38     ` Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444544952-32408-6-git-send-email-vapier@gentoo.org \
    --to=vapier@gentoo.org \
    --cc=gentoo-catalyst@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox