Skip to content

Commit aec2bfd

Browse files
Packages (Linux): fixes Linglong detection by counting linglong layers (#1903)
* Packages (Linux): fixes Linglong detection on Deepin * Packages (Linux): fixes Linglong detection to count layers * Update src/detection/packages/packages_linux.c --------- Co-authored-by: Carter Li <[email protected]>
1 parent 1479de1 commit aec2bfd

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

src/detection/packages/packages_linux.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -446,12 +446,7 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
446446
{
447447
packageCounts->guixSystem += getGuixPackages(baseDir, "/run/current-system/profile");
448448
}
449-
if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT))
450-
{
451-
packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/heads/main", true);
452-
if (packageCounts->linglong == 0)
453-
packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/repo/refs/remotes/stable/main", true);
454-
}
449+
if (!(options->disabled & FF_PACKAGES_FLAG_LINGLONG_BIT)) packageCounts->linglong += getNumElements(baseDir, "/var/lib/linglong/layers", true);
455450
if (!(options->disabled & FF_PACKAGES_FLAG_PACSTALL_BIT)) packageCounts->pacstall += getNumElements(baseDir, "/var/lib/pacstall/metadata", false);
456451
if (!(options->disabled & FF_PACKAGES_FLAG_PISI_BIT)) packageCounts->pisi += getNumElements(baseDir, "/var/lib/pisi/package", true);
457452
if (!(options->disabled & FF_PACKAGES_FLAG_PKGSRC_BIT)) packageCounts->pkgsrc += getNumElements(baseDir, "/usr/pkg/pkgdb", DT_DIR);

0 commit comments

Comments
 (0)