Skip to content

Commit e63dfdd

Browse files
committed
Packages: fix parsing of JSON config; fix wording of json_schema
1 parent a6639d7 commit e63dfdd

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
lines changed

doc/json_schema.json

Lines changed: 29 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,9 +1576,35 @@
15761576
"description": "List installed package managers and count of installed packages"
15771577
},
15781578
"disabled": {
1579-
"description": "A colon separated list of package managers to be disabled when detecting",
1580-
"type": "string",
1581-
"default": "winget"
1579+
"description": "List of package managers to be disabled when detecting",
1580+
"type": "array",
1581+
"items": {
1582+
"type": "string",
1583+
"enum": [
1584+
"am",
1585+
"apk",
1586+
"brew",
1587+
"choco",
1588+
"dpkg",
1589+
"emerge",
1590+
"eopkg",
1591+
"flatpak",
1592+
"macports",
1593+
"nix",
1594+
"opkg",
1595+
"pacman",
1596+
"paludis",
1597+
"pkg",
1598+
"pkgtool",
1599+
"rpm",
1600+
"scoop",
1601+
"snap",
1602+
"winget",
1603+
"xbps"
1604+
],
1605+
"uniqueItems": true
1606+
},
1607+
"default": ["winget"]
15821608
},
15831609
"key": {
15841610
"$ref": "#/$defs/key"

src/modules/packages/packages.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
276276
}
277277
#undef FF_TEST_PACKAGE_NAME
278278
}
279+
continue;
279280
}
280281
}
281282

0 commit comments

Comments
 (0)