fosslight-dependency 4.1.10__tar.gz → 4.1.12__tar.gz

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight_dependency
-Version: 4.1.10
+Version: 4.1.12
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/setup.py

@@ -35,7 +35,7 @@ if __name__ == "__main__":
 
     setup(
         name=_PACKAEG_NAME,
-        version='4.1.10',
+        version='4.1.12',
         package_dir={"": "src"},
         packages=find_namespace_packages(where='src'),
         description='FOSSLight Dependency Scanner',

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/src/fosslight_dependency/_package_manager.py

@@ -354,11 +354,12 @@ def check_license_name(license_txt, is_filepath=False):
 
 
 def change_file_mode(filepath, mode=''):
-    current_mode = os.stat(filepath).st_mode
+    current_mode = ''
 
     if not os.path.exists(filepath):
         logger.debug(f"The file{filepath} does not exist.")
     else:
+        current_mode = os.stat(filepath).st_mode
         if not mode:
             new_mode = current_mode | stat.S_IXUSR | stat.S_IXGRP | stat.S_IXOTH
         else:

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/src/fosslight_dependency/package_manager/Maven.py

@@ -134,15 +134,17 @@ class Maven(PackageManager):
 
     def run_maven_plugin(self):
         logger.info('Run maven license scanning plugin with temporary pom.xml')
+        current_mode = ''
         if os.path.isfile('mvnw') or os.path.isfile('mvnw.cmd'):
             if self.platform == const.WINDOWS:
                 cmd_mvn = "mvnw.cmd"
             else:
                 cmd_mvn = "./mvnw"
+            current_mode = change_file_mode(cmd_mvn)
         else:
             cmd_mvn = "mvn"
         cmd = f"{cmd_mvn} license:aggregate-download-licenses"
-        current_mode = change_file_mode(cmd_mvn)
+
         ret = subprocess.call(cmd, shell=True)
         if ret != 0:
             logger.error(f"Failed to run maven plugin: {cmd}")
@@ -159,7 +161,8 @@ class Maven(PackageManager):
         except Exception as e:
             logger.error(f"Failed to run '{cmd}': {e}")
             self.set_direct_dependencies(False)
-        change_file_mode(cmd_mvn, current_mode)
+        if current_mode:
+            change_file_mode(cmd_mvn, current_mode)
 
     def create_dep_stack(self, dep_line):
         dep_stack = []

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/src/fosslight_dependency/package_manager/Pypi.py

@@ -129,7 +129,7 @@ class Pypi(PackageManager):
             if cmd_ret.returncode != 0:
                 ret = False
                 err_msg = f"return code({cmd_ret.returncode})"
-            elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'):
+            elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
                 ret = False
                 err_msg = f"stderr msg({cmd_ret.stderr})"
         except Exception as e:
@@ -137,7 +137,7 @@ class Pypi(PackageManager):
             err_msg = e
         finally:
             try:
-                if self.platform != const.WINDOWS:
+                if (not ret) and (self.platform != const.WINDOWS):
                     ret = True
                     create_venv_cmd = f"virtualenv -p python3 {self.venv_tmp_dir}"
 
@@ -147,14 +147,14 @@ class Pypi(PackageManager):
                     if cmd_ret.returncode != 0:
                         ret = False
                         err_msg = f"return code({cmd_ret.returncode})"
-                    elif cmd_ret.stderr.decode('utf-8').rstrip().startswith('ERROR:'):
+                    elif cmd_ret.stderr.decode('utf-8').strip().lower().startswith('error:'):
                         ret = False
                         err_msg = f"stderr msg({cmd_ret.stderr})"
             except Exception as e:
                 ret = False
                 err_msg = e
             if ret:
-                logger.info(f"It created the temporary virtualenv({venv_path}).")
+                logger.info(f"Created the temporary virtualenv({venv_path}).")
             else:
                 logger.error(f"Failed to create virtualenv: {err_msg}")
 

{fosslight_dependency-4.1.10 → fosslight_dependency-4.1.12}/src/fosslight_dependency.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: fosslight-dependency
-Version: 4.1.10
+Version: 4.1.12
 Summary: FOSSLight Dependency Scanner
 Home-page: https://github.com/fosslight/fosslight_dependency_scanner
 Author: LG Electronics