Skip to content

Commit 616b674

Browse files
committed
Fix MultipleRoutesDefined error for uclibc
- packageurl.contrib.route doesn't have a way to properly specify the pattern where a particular versionless and versioned PURL needs to be routed to the same function. Signed-off-by: Keshav Priyadarshi <[email protected]>
1 parent babfe85 commit 616b674

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/fetchcode/package.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -838,7 +838,7 @@ class UclibcDirectoryListedSource(DirectoryListedSource):
838838
class UclibcNGDirectoryListedSource(DirectoryListedSource):
839839
source_url = "https://downloads.uclibc-ng.org/releases/"
840840
source_archive_regex = r"^(uClibc-ng-)([\w.-]*)(.tar.gz)$"
841-
is_nested = False
841+
is_nested = True
842842
ignored_files_and_dir = []
843843

844844

@@ -971,7 +971,8 @@ class DropbearDirectoryListedSource(DirectoryListedSource):
971971
"pkg:generic/openssh.*",
972972
"pkg:generic/syslinux.*",
973973
"pkg:generic/toybox.*",
974-
"pkg:generic/uclibc.*",
974+
"pkg:generic/uclibc",
975+
"pkg:generic/uclibc@.*"
975976
"pkg:generic/uclibc-ng.*",
976977
"pkg:generic/util-linux.*",
977978
"pkg:generic/wpa_supplicant.*",
@@ -1009,7 +1010,6 @@ def get_htmllisting_data_from_purl(purl):
10091010
package_url
10101011
)
10111012

1012-
10131013
def get_packages_from_listing(purl, source_archive_url, regex, ignored_files_and_dir):
10141014
"""
10151015
Return list of package data from a directory listing based on the specified regex.

0 commit comments

Comments
 (0)