mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
Update common, image, and storage deps
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
This commit is contained in:
![29139614+renovate[bot]@users.noreply.github.com](/assets/img/avatar_default.png)
committed by
Paul Holzinger

parent
32d96f40c3
commit
444f19cb2a
9
vendor/github.com/mistifyio/go-zfs/v3/utils.go
generated
vendored
9
vendor/github.com/mistifyio/go-zfs/v3/utils.go
generated
vendored
@ -37,13 +37,16 @@ func (c *command) Run(arg ...string) ([][]string, error) {
|
||||
cmd.Stderr = &stderr
|
||||
|
||||
id := uuid.New().String()
|
||||
joinedArgs := strings.Join(cmd.Args, " ")
|
||||
joinedArgs := cmd.Path
|
||||
if len(cmd.Args) > 1 {
|
||||
joinedArgs = strings.Join(append([]string{cmd.Path}, cmd.Args[1:]...), " ")
|
||||
}
|
||||
|
||||
logger.Log([]string{"ID:" + id, "START", joinedArgs})
|
||||
if err := cmd.Run(); err != nil {
|
||||
return nil, &Error{
|
||||
Err: err,
|
||||
Debug: strings.Join([]string{cmd.Path, joinedArgs[1:]}, " "),
|
||||
Debug: joinedArgs,
|
||||
Stderr: stderr.String(),
|
||||
}
|
||||
}
|
||||
@ -61,7 +64,7 @@ func (c *command) Run(arg ...string) ([][]string, error) {
|
||||
output := make([][]string, len(lines))
|
||||
|
||||
for i, l := range lines {
|
||||
output[i] = strings.Fields(l)
|
||||
output[i] = strings.Split(l, "\t")
|
||||
}
|
||||
|
||||
return output, nil
|
||||
|
Reference in New Issue
Block a user