Skip to content

Commit 1b884e6

Browse files
committed
fix(cli): pass repo_root=None to expand_vars in expand_profile_set_vars
Upstream added expand_profile_set_vars in the merge, which called expand_vars with 2 args. Our branch extended the signature with a third repo_root argument. Pass None since env var value expansion does not require $REPO_ROOT resolution. Signed-off-by: Amit Singh <amitds1997@gmail.com>
1 parent 89feae9 commit 1b884e6

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -453,9 +453,9 @@
453453

454454

455455
### Security
456-
- Sandbox escape on Linux via D-Bus ([GHSA-27vp-2mmc-vmh3](https://github.com/always-further/nono/security/advisories/GHSA-27vp-2mmc-vmh3)) - reported by @cgwalters
456+
- Sandbox escape on Linux via D-Bus ([GHSA-27vp-2mmc-vmh3](https://github.com/always-further/nono/security/advisories/GHSA-27vp-2mmc-vmh3)) reported by @cgwalters
457457

458-
GHSA-27vp-2mmc-vmh3
458+
GHSA-27vp-2mmc-vmh3
459459

460460
### Bug Fixes
461461

@@ -869,7 +869,7 @@ GHSA-27vp-2mmc-vmh3
869869

870870
### Features
871871

872-
- *(profile)* #594 phase 2 - canonical JSON schema restructure (#594)
872+
- *(profile)* #594 phase 2 canonical JSON schema restructure (#594)
873873

874874

875875
### Performance
@@ -1551,7 +1551,7 @@ GHSA-27vp-2mmc-vmh3
15511551

15521552
- Allow filesystem.read entries to be files
15531553

1554-
- *(proxy)* Address review feedback - normalize prefix in CredentialStore
1554+
- *(proxy)* Address review feedback normalize prefix in CredentialStore
15551555

15561556
- *(proxy)* Handle route prefixes with leading slashes
15571557

crates/nono-cli/src/profile_runtime.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ fn expand_profile_set_vars(
467467
let Some(value) = env_config.set_vars.get(key) else {
468468
continue;
469469
};
470-
let expanded_value = profile::expand_vars(value, workdir)?
470+
let expanded_value = profile::expand_vars(value, workdir, None)?
471471
.to_string_lossy()
472472
.into_owned();
473473
expanded.push((key.clone(), expanded_value));

0 commit comments

Comments
 (0)