From: Fredrik Unger <fred@tree.se>
Date: Tue, 31 Mar 2015 12:25:54 +0000 (+0200)
Subject: tools: adding error and warning calls
X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=commitdiff_plain;h=95e6acdfdfc9cd21d5e33a396d166d245c06d3ae

tools: adding error and warning calls

Adding calls to error and warning to simplify error reporting
to standard error.
---

diff --git a/treecutter/docbook.py b/treecutter/docbook.py
index a143487..e7b6e9f 100644
--- a/treecutter/docbook.py
+++ b/treecutter/docbook.py
@@ -11,6 +11,7 @@ from time import time
 
 import treecutter.constants as const
 from treecutter.image import Image
+from treecutter.tools import warning
 
 class Docbook():
     """Class representing a docbook document"""
@@ -82,7 +83,8 @@ class Docbook():
                 (stdout, stderr) = xml.communicate()
                 #print xml.returnvalue
                 if stderr:
-                    print " ".join(exe)+" ERROR : [ "+stderr+" ]"
+                    warning("%s : %s" % (" ".join(exe),stderr))
+                    warning(stdout)
                     exit
                 os.chdir(cwd)
                 te = time()
diff --git a/treecutter/tools.py b/treecutter/tools.py
index 62cb32a..fa06a6d 100644
--- a/treecutter/tools.py
+++ b/treecutter/tools.py
@@ -1,7 +1,9 @@
 #!/usr/bin/python
+from __future__ import print_function
 import os
 import subprocess
 import errno
+import sys
 
 def mkdir_p(path):
     try:
@@ -15,7 +17,7 @@ def publish(src,target):
     cmd = ["rsync","-a","--delete",src,target]
     retcode = subprocess.call(cmd)
     if retcode:
-        print 'Error: '+' '.join(cmd)+' Returncode ['+str(retcode)+']'
+        error('%s : retruncode %s' % (' '.join(cmd),str(retcode)))
 
 def ssh_cmd(target, command):
     t = target.split(":")
@@ -26,7 +28,7 @@ def ssh_cmd(target, command):
         cmd = ["ssh",t[0],c[0],c[1],t[1]]
     retcode = subprocess.call(cmd)
     if retcode:
-        print 'Error: '+' '.join(cmd)+' Returncode ['+str(retcode)+']'
+        error('%s : retruncode %s' % (' '.join(cmd),str(retcode)))
 
 def sizeof_fmt(num, suffix='B'):
     for unit in ['','Ki','Mi','Gi','Ti','Pi','Ei','Zi']:
@@ -44,3 +46,9 @@ def get_folder_size(folder):
         elif os.path.isdir(itempath):
             total_size += get_folder_size(itempath)
     return total_size
+
+def warning(*objs):
+    print("WARNING: ", *objs, file=sys.stderr)
+
+def error(*objs):
+    print("ERROR: ", *objs, file=sys.stderr)