X-Git-Url: https://source.tree.se/git?p=treecutter.git;a=blobdiff_plain;f=treecutter%2Ftools.py;fp=treecutter%2Ftools.py;h=fa06a6d1272ab2e2abf757177098462b5ecdf366;hp=62cb32a71943c6cdf3aa19bd59f20ef8bfd2c398;hb=95e6acdfdfc9cd21d5e33a396d166d245c06d3ae;hpb=50c8b1ff1feb0a5f445911f9dd1d234f2ea3e54e 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)