Skip to content

Commit 1d16a01

Browse files
author
Tim Keir
committed
fix #6029
1 parent 547a669 commit 1d16a01

File tree

2 files changed

+35
-1
lines changed

2 files changed

+35
-1
lines changed

.yarn/versions/4c645b68.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
releases:
2+
"@yarnpkg/cli": patch
3+
"@yarnpkg/core": patch
4+
"@yarnpkg/plugin-essentials": patch
5+
"@yarnpkg/plugin-interactive-tools": patch
6+
"@yarnpkg/plugin-npm": patch
7+
"@yarnpkg/plugin-typescript": patch
8+
9+
declined:
10+
- "@yarnpkg/plugin-compat"
11+
- "@yarnpkg/plugin-constraints"
12+
- "@yarnpkg/plugin-dlx"
13+
- "@yarnpkg/plugin-exec"
14+
- "@yarnpkg/plugin-file"
15+
- "@yarnpkg/plugin-git"
16+
- "@yarnpkg/plugin-github"
17+
- "@yarnpkg/plugin-http"
18+
- "@yarnpkg/plugin-init"
19+
- "@yarnpkg/plugin-link"
20+
- "@yarnpkg/plugin-nm"
21+
- "@yarnpkg/plugin-npm-cli"
22+
- "@yarnpkg/plugin-pack"
23+
- "@yarnpkg/plugin-patch"
24+
- "@yarnpkg/plugin-pnp"
25+
- "@yarnpkg/plugin-pnpm"
26+
- "@yarnpkg/plugin-stage"
27+
- "@yarnpkg/plugin-version"
28+
- "@yarnpkg/plugin-workspace-tools"
29+
- "@yarnpkg/builder"
30+
- "@yarnpkg/doctor"
31+
- "@yarnpkg/extensions"
32+
- "@yarnpkg/nm"
33+
- "@yarnpkg/pnpify"
34+
- "@yarnpkg/sdks"

packages/plugin-essentials/sources/commands/install.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ async function autofixMergeConflicts(configuration: Configuration, immutable: bo
455455
continue;
456456

457457
const checksum = variant[key].checksum;
458-
if (typeof checksum === `string` && checksum.includes(`/`))
458+
if (typeof checksum === `string` && checksum.includes(`/`) || typeof checksum === 'undefined')
459459
continue;
460460

461461
variant[key].checksum = `${variant.__metadata.cacheKey}/${checksum}`;

0 commit comments

Comments
 (0)