Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the fs output path #81

Merged
merged 1 commit into from
Nov 6, 2023
Merged

Fix the fs output path #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
future
pandas
xlrd
openpyxl
progress
pyyaml
Expand Down
4 changes: 1 addition & 3 deletions src/fosslight_scanner/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from fosslight_util.write_scancodejson import write_scancodejson
from fosslight_util.read_excel import read_oss_report
from fosslight_util.output_format import write_output_file
from pathlib import Path
from fosslight_util.oss_item import OssItem

logger = logging.getLogger(constant.LOGGER_NAME)
Expand Down Expand Up @@ -215,8 +214,7 @@ def create_scancodejson(final_report, output_extension, ui_mode_report, src_path
src_path = os.path.abspath(src_path)
parent = os.path.basename(src_path)
root_strip = src_path.replace(parent, "")
two_depth_parent = os.path.basename(Path(src_path).parents[0])
root_dir = os.path.join(two_depth_parent, parent)
root_dir = parent
except Exception:
root_dir = ""

Expand Down
Loading