Skip to content

Commit 4f0f318

Browse files
authored
fix(cli.rs): fix tauri info panic when a package isn't installed, closes #3985 (#3996)
1 parent 094534d commit 4f0f318

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

.changes/cli.rs-info-panic.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"cli.rs": patch
3+
"cli.js": patch
4+
---
5+
6+
Fix `tauri info` panic when a pacakage isn't installed.

tooling/cli/metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"cli.js": {
33
"version": "1.0.0-rc.9",
4-
"node": ">= 10"
4+
"node": ">= 10.0.0"
55
},
66
"tauri": "1.0.0-rc.8",
77
"tauri-build": "1.0.0-rc.7"

tooling/cli/src/info.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,6 @@ struct VersionBlock {
494494
version: String,
495495
target_version: String,
496496
indentation: usize,
497-
skip_update_check: bool,
498497
}
499498

500499
impl VersionBlock {
@@ -504,15 +503,9 @@ impl VersionBlock {
504503
version: version.into(),
505504
target_version: "".into(),
506505
indentation: 2,
507-
skip_update_check: false,
508506
}
509507
}
510508

511-
fn skip_update_check(mut self) -> Self {
512-
self.skip_update_check = true;
513-
self
514-
}
515-
516509
fn target_version(mut self, version: impl Into<String>) -> Self {
517510
self.target_version = version.into();
518511
self
@@ -531,7 +524,7 @@ impl VersionBlock {
531524
self.version.clone()
532525
}
533526
);
534-
if !self.target_version.is_empty() && !self.skip_update_check {
527+
if !(self.version.is_empty() || self.target_version.is_empty()) {
535528
let version = semver::Version::parse(self.version.as_str()).unwrap();
536529
let target_version = semver::Version::parse(self.target_version.as_str()).unwrap();
537530
if version < target_version {
@@ -630,7 +623,6 @@ pub fn command(_options: Options) -> Result<()> {
630623
.collect::<String>(),
631624
)
632625
.target_version(metadata.js_cli.node.replace(">= ", ""))
633-
.skip_update_check()
634626
.display();
635627

636628
VersionBlock::new(

0 commit comments

Comments
 (0)