Skip to content

Commit ab960f9

Browse files
committed
Merge with main
2 parents 3d6c11a + fe0b042 commit ab960f9

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
APT::Update::Error-Mode "any";

pkg/board/os_image.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ func GetOSImageVersion(conn remote.RemoteConn) string {
3737
defer f.Close()
3838

3939
if version, ok := parseOSImageVersion(f); ok {
40-
slog.Info("found OS Image version", "version", version)
4140
return version
4241
}
4342
slog.Warn("Unable to find OS Image version", "using_default", R0_IMAGE_VERSION_ID)
@@ -54,7 +53,7 @@ func parseOSImageVersion(r io.Reader) (string, bool) {
5453
continue
5554
}
5655

57-
version := strings.Trim(value, `"' `)
56+
version := strings.TrimSpace(value)
5857
if version != "" {
5958
return version, true
6059
}

pkg/board/os_image_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func TestParseOSImageVersion(t *testing.T) {
7777
}{
7878
{
7979
name: "valid build id",
80-
input: "BUILD_ID=\"20251006-395\"\nVARIANT_ID=xfce",
80+
input: "BUILD_ID=20251006-395\nVARIANT_ID=xfce",
8181
expected: "20251006-395",
8282
found: true,
8383
},

0 commit comments

Comments
 (0)