[PR PATCH] incus: fix check script

[PR PATCH] incus: fix check script

[akarelas]

[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]

There is a new pull request by akarelas against master on the void-packages repository

https://github.com/akarelas/void-packages pr-akarelas-incus
https://github.com/void-linux/void-packages/pull/51609

incus: fix check script
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Reason for making it
The line `exec 2>&1` in the beginning of `incus-user/check` would stop the execution of the script right there, and would return a non-zero value, making `sv restart incus-user` show a timeout (after 7 seconds), like this:

```
-bash-5.2# sv start incus-user
timeout: run: incus-user: (pid 9181) 7s
```

Placing `2>&1` at the right point, the execution of `sv restart incus-user` is like this:

```
-bash-5.2# sv restart incus-user
ok: run: incus-user: (pid 9370) 0s
```

...in less than a second.

A patch file from https://github.com/void-linux/void-packages/pull/51609.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-akarelas-incus-51609.patch --]
[-- Type: text/x-diff, Size: 624 bytes --]

From 50f736d9769f3280bf3b33be7fae3d4c809271b6 Mon Sep 17 00:00:00 2001
From: Alexander Karelas <karjala@cpan.org>
Date: Fri, 2 Aug 2024 20:46:25 +0300
Subject: [PATCH] incus: fix check script

---
 srcpkgs/incus/files/incus-user/check | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus-user/check
index d4d7293364e8d8..0efa9073216f7d 100755
--- a/srcpkgs/incus/files/incus-user/check
+++ b/srcpkgs/incus/files/incus-user/check
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
-exec incus config show >/dev/null
+exec incus config show >/dev/null 2>&1

Re: incus: fix check script

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/51609#issuecomment-2265883131

Comment:
needs a package revision increment

Re: [PR PATCH] [Updated] incus: fix check script

[akarelas]

[-- Attachment #1: Type: text/plain, Size: 1019 bytes --]

There is an updated pull request by akarelas against master on the void-packages repository

https://github.com/akarelas/void-packages pr-akarelas-incus
https://github.com/void-linux/void-packages/pull/51609

incus: fix check script
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Reason for making it
The line `exec 2>&1` in the beginning of `incus-user/check` would stop the execution of the script right there, and would return a non-zero value, making `sv restart incus-user` show a timeout (after 7 seconds), like this:

```
-bash-5.2# sv start incus-user
timeout: run: incus-user: (pid 9181) 7s
```

Placing `2>&1` at the right point, the execution of `sv restart incus-user` is like this:

```
-bash-5.2# sv restart incus-user
ok: run: incus-user: (pid 9370) 0s
```

...in less than a second.

A patch file from https://github.com/void-linux/void-packages/pull/51609.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pr-akarelas-incus-51609.patch --]
[-- Type: text/x-diff, Size: 1008 bytes --]

From 38d7e2b3c8c0ec0566c60ce0a7e4a2a217c1e752 Mon Sep 17 00:00:00 2001
From: Alexander Karelas <karjala@cpan.org>
Date: Fri, 2 Aug 2024 20:46:25 +0300
Subject: [PATCH] incus: fix check script

---
 srcpkgs/incus/files/incus-user/check | 3 +--
 srcpkgs/incus/template               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/incus/files/incus-user/check b/srcpkgs/incus/files/incus-user/check
index d4d7293364e8d8..0efa9073216f7d 100755
--- a/srcpkgs/incus/files/incus-user/check
+++ b/srcpkgs/incus/files/incus-user/check
@@ -1,3 +1,2 @@
 #!/bin/sh
-exec 2>&1
-exec incus config show >/dev/null
+exec incus config show >/dev/null 2>&1
diff --git a/srcpkgs/incus/template b/srcpkgs/incus/template
index edb7d790578073..c41b09aaa39b90 100644
--- a/srcpkgs/incus/template
+++ b/srcpkgs/incus/template
@@ -1,7 +1,7 @@
 # Template file for 'incus'
 pkgname=incus
 version=6.3.0
-revision=2
+revision=3
 build_style=go
 build_helper=qemu
 go_import_path=github.com/lxc/incus/v6

Re: incus: fix check script

[akarelas]

[-- Attachment #1: Type: text/plain, Size: 187 bytes --]

New comment by akarelas on void-packages repository

https://github.com/void-linux/void-packages/pull/51609#issuecomment-2265886162

Comment:
> needs a package revision increment

done

Re: [PR PATCH] [Merged]: incus: fix check script

[classabbyamp]

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

There's a merged pull request on the void-packages repository

incus: fix check script
https://github.com/void-linux/void-packages/pull/51609

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### Reason for making it
The line `exec 2>&1` in the beginning of `incus-user/check` would stop the execution of the script right there, and would return a non-zero value, making `sv restart incus-user` show a timeout (after 7 seconds), like this:

```
-bash-5.2# sv start incus-user
timeout: run: incus-user: (pid 9181) 7s
```

Placing `2>&1` at the right point, the execution of `sv restart incus-user` is like this:

```
-bash-5.2# sv restart incus-user
ok: run: incus-user: (pid 9370) 0s
```

...in less than a second.