diff --git a/lib/utils.py b/lib/utils.py index f7af93ae3d1562495314a4d699a17b595f137d60..f31dd0521ed41f754f251967e3aaef79a967d21b 100644 --- a/lib/utils.py +++ b/lib/utils.py @@ -683,7 +683,7 @@ def pack_log_dir(logdir, args, result): print('Error: There are no log files to package in path {}'.format(logdir)) return False logdir_dirname = os.path.dirname(logdir) - abs_log_tar_name = logdir_dirname + '/%s.tar.gz' % os.path.basename(logdir) + abs_log_tar_name = logdir_dirname + '/%s.tar' % os.path.basename(logdir) try: with tarfile.open(abs_log_tar_name, "w") as tar: tar.add(logdir, arcname=os.path.basename(logdir)) @@ -708,7 +708,7 @@ def pack_log_dir(logdir, args, result): rpm_verify=rpm_verify_f) cmd += """ tar -rf {log_tar_name} {checksum}/{md5_fname} && - tar -tf {log_tar_name} | grep tar.gz.md5 && + tar -tf {log_tar_name} | grep tar.md5 && rm -rf {md5_path} """.format(log_tar_name=log_tar_name, md5_fname=md5_fname, checksum=os.path.basename(md5_path), md5_path=md5_path) @@ -722,9 +722,12 @@ def pack_log_dir(logdir, args, result): if args.category: print('%s Test *%s*!' % (args.category, 'PASS' if result else 'FAIL')) - print('Save tar log file to: %s' % abs_log_tar_name) - print('Please send tar log file %s OpenAnolis hardware compatibility team. ' + print('Save tar log file to: %s' % abs_log_tar_name) + print('Please send tar log file %s OpenAnolis hardware compatibility team. ' % ('to' if result else 'and ask help from')) + + if args.list_hardware: + print('Save tar log file to: %s' % abs_log_tar_name) return True