Skip to content

Commit 21cc16a

Browse files
authored
Merge pull request #81 from fosslight/develop
Fix the fs output path
2 parents ad1238a + 572902f commit 21cc16a

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

requirements.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
future
22
pandas
3-
xlrd
43
openpyxl
54
progress
65
pyyaml

src/fosslight_scanner/common.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from fosslight_util.write_scancodejson import write_scancodejson
1818
from fosslight_util.read_excel import read_oss_report
1919
from fosslight_util.output_format import write_output_file
20-
from pathlib import Path
2120
from fosslight_util.oss_item import OssItem
2221

2322
logger = logging.getLogger(constant.LOGGER_NAME)
@@ -215,8 +214,7 @@ def create_scancodejson(final_report, output_extension, ui_mode_report, src_path
215214
src_path = os.path.abspath(src_path)
216215
parent = os.path.basename(src_path)
217216
root_strip = src_path.replace(parent, "")
218-
two_depth_parent = os.path.basename(Path(src_path).parents[0])
219-
root_dir = os.path.join(two_depth_parent, parent)
217+
root_dir = parent
220218
except Exception:
221219
root_dir = ""
222220

0 commit comments

Comments
 (0)