Skip to content

Commit 1b4ad98

Browse files
committed
scancode: add logger and parse it to get count
1 parent adaa2b6 commit 1b4ad98

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ matrix:
8282
echo "License check OK";
8383
else
8484
echo "License check failed, please review license issues found";
85-
STATUSM="Needs review, ${retval} license issues found";
85+
COUNT=$(cat scancode-evaluate.log | grep File: | wc -l)
86+
STATUSM="Needs review, ${COUNT} license issues found";
8687
set_status "success" "$STATUSM";
8788
fi
8889

tools/test/travis-ci/scancode-evaluate.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232

3333
userlog = logging.getLogger("scancode-evaluate")
3434
userlog.setLevel(logging.INFO)
35+
logfile = os.path.join(os.getcwd(), 'scancode-evaluate.log')
36+
log_file_handler = logging.FileHandler(logfile, mode='w')
37+
userlog.addHandler(log_file_handler)
3538

3639
MISSING_LICENSE_TEXT = "Missing license header"
3740
MISSING_PERMISIVE_LICENSE_TEXT = "Non-permissive license"
@@ -120,7 +123,11 @@ def parse_args():
120123

121124
args = parse_args()
122125
if args.file and os.path.isfile(args.file):
123-
sys.exit(license_check(args.directory_name, args.file))
126+
count = license_check(args.directory_name, args.file)
127+
if count == 0:
128+
sys.exit(0)
129+
else:
130+
sys.exit(-1)
124131
else:
125132
userlog.warning("Could not find the scancode json file")
126133
sys.exit(-1)

0 commit comments

Comments
 (0)