fosslight-dependency 4.1.11__tar.gz → 4.1.13__tar.gz

{fosslight_dependency-4.1.11 → fosslight_dependency-4.1.13}/PKG-INFO

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

{fosslight_dependency-4.1.11 → fosslight_dependency-4.1.13}/setup.py

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

{fosslight_dependency-4.1.11 → fosslight_dependency-4.1.13}/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.11 → fosslight_dependency-4.1.13}/src/fosslight_dependency/package_manager/Go.py

@@ -11,6 +11,7 @@ from bs4 import BeautifulSoup
 import urllib.request
 import re
 import shutil
+import time
 import fosslight_util.constant as constant
 import fosslight_dependency.constant as const
 from fosslight_dependency._package_manager import PackageManager, get_url_to_purl
@@ -128,16 +129,29 @@ class Go(PackageManager):
                 homepage_set.append(oss_item.homepage)
 
                 for homepage_i in homepage_set:
-                    try:
-                        res = urllib.request.urlopen(homepage_i)
-                        if res.getcode() == 200:
-                            urlopen_success = True
-                            if homepage_i == oss_item.homepage:
-                                if oss_item.version:
-                                    oss_item.comment = f'Cannot connect {tmp_homepage}, get info from the latest version.'
+                    urlopen_success = False
+                    while True:
+                        try:
+                            res = urllib.request.urlopen(homepage_i)
+                            if res.getcode() == 200:
+                                urlopen_success = True
+                                if homepage_i == oss_item.homepage:
+                                    if oss_item.version:
+                                        oss_item.comment = f'Cannot connect {tmp_homepage}, get info from the latest version.'
+                                break
+                        except urllib.error.HTTPError as e:
+                            if e.code == 429:
+                                logger.info(f"{e} ({homepage_i}), Retrying to connect after 20 seconds")
+                                time.sleep(20)
+                                continue
+                            else:
+                                logger.info(f"{e} ({homepage_i})")
+                                break
+                        except Exception as e:
+                            logger.warning(f"{e} ({homepage_i})")
                             break
-                    except Exception:
-                        continue
+                    if urlopen_success:
+                        break
 
                 if urlopen_success:
                     content = res.read().decode('utf8')

{fosslight_dependency-4.1.11 → fosslight_dependency-4.1.13}/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.11 → fosslight_dependency-4.1.13}/src/fosslight_dependency/package_manager/Npm.py

@@ -176,7 +176,7 @@ class Npm(PackageManager):
                 if d[_private]:
                     private_pkg = True
 
-            oss_item.homepage = self.dn_url + oss_init_name
+            oss_item.download_location = self.dn_url + oss_init_name
             dn_loc = f"{self.dn_url}{oss_init_name}/v/{oss_item.version}"
             dep_item.purl = get_url_to_purl(dn_loc, self.package_manager_name)
             purl_dict[f'{oss_init_name}({oss_item.version})'] = dep_item.purl
@@ -185,10 +185,10 @@ class Npm(PackageManager):
             elif private_pkg:
                 dn_loc = ''
 
-            oss_item.download_location = dn_loc
+            oss_item.homepage = dn_loc
 
             if private_pkg:
-                oss_item.homepage = oss_item.download_location
+                oss_item.download_location = oss_item.homepage
                 oss_item.comment = 'private'
             if self.package_name == f'{oss_init_name}({oss_item.version})':
                 oss_item.comment = 'root package'

{fosslight_dependency-4.1.11 → fosslight_dependency-4.1.13}/src/fosslight_dependency.egg-info/PKG-INFO

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