Merge branch 'master' of https://git.neoteched.com/zhangwei/ops

cms_log/cms_log/util/comm.py

@@ -61,7 +61,7 @@ def analysis_log(log_file, project_name, tmp_dir, check_string):
     if project_name == 'php':
         cmd_line = "grep -a " + check_string + " " + log_file + " > " + new_tmp_file
     os.system(cmd_line)
-    if exist_file(old_tmp_file):
+    if exist_file(old_tmp_file) and os.path.getsize(new_tmp_file) > 1:
         cmd_line = "diff " + old_tmp_file + " " + new_tmp_file
         diff_arr = os.popen(cmd_line).readlines()
         new_error_num = len(diff_arr)