mirror of
				https://github.com/containers/podman.git
				synced 2025-11-01 02:42:11 +08:00 
			
		
		
		
	build(deps): bump github.com/containers/storage from 1.15.0 to 1.15.2
Bumps [github.com/containers/storage](https://github.com/containers/storage) from 1.15.0 to 1.15.2. - [Release notes](https://github.com/containers/storage/releases) - [Changelog](https://github.com/containers/storage/blob/master/docs/containers-storage-changes.md) - [Commits](https://github.com/containers/storage/compare/v1.15.0...v1.15.2) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
		![27856297+dependabot-preview[bot]@users.noreply.github.com](/assets/img/avatar_default.png) dependabot-preview[bot]
					dependabot-preview[bot]
				
			
				
					committed by
					
						 Valentin Rothberg
						Valentin Rothberg
					
				
			
			
				
	
			
			
			 Valentin Rothberg
						Valentin Rothberg
					
				
			
						parent
						
							465e142bf2
						
					
				
				
					commit
					625a02a286
				
			
							
								
								
									
										26
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/process.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										26
									
								
								vendor/github.com/Microsoft/hcsshim/internal/hcs/process.go
									
									
									
										generated
									
									
										vendored
									
									
								
							| @ -20,6 +20,8 @@ type Process struct { | ||||
| 	handle         vmcompute.HcsProcess | ||||
| 	processID      int | ||||
| 	system         *System | ||||
| 	hasCachedStdio bool | ||||
| 	stdioLock      sync.Mutex | ||||
| 	stdin          io.WriteCloser | ||||
| 	stdout         io.ReadCloser | ||||
| 	stderr         io.ReadCloser | ||||
| @ -272,8 +274,8 @@ func (process *Process) ExitCode() (int, error) { | ||||
| } | ||||
|  | ||||
| // StdioLegacy returns the stdin, stdout, and stderr pipes, respectively. Closing | ||||
| // these pipes does not close the underlying pipes; but this function can only | ||||
| // be called once on each Process. | ||||
| // these pipes does not close the underlying pipes. Once returned, these pipes | ||||
| // are the responsibility of the caller to close. | ||||
| func (process *Process) StdioLegacy() (_ io.WriteCloser, _ io.ReadCloser, _ io.ReadCloser, err error) { | ||||
| 	operation := "hcsshim::Process::StdioLegacy" | ||||
| 	ctx, span := trace.StartSpan(context.Background(), operation) | ||||
| @ -290,6 +292,15 @@ func (process *Process) StdioLegacy() (_ io.WriteCloser, _ io.ReadCloser, _ io.R | ||||
| 		return nil, nil, nil, makeProcessError(process, operation, ErrAlreadyClosed, nil) | ||||
| 	} | ||||
|  | ||||
| 	process.stdioLock.Lock() | ||||
| 	defer process.stdioLock.Unlock() | ||||
| 	if process.hasCachedStdio { | ||||
| 		stdin, stdout, stderr := process.stdin, process.stdout, process.stderr | ||||
| 		process.stdin, process.stdout, process.stderr = nil, nil, nil | ||||
| 		process.hasCachedStdio = false | ||||
| 		return stdin, stdout, stderr, nil | ||||
| 	} | ||||
|  | ||||
| 	processInfo, resultJSON, err := vmcompute.HcsGetProcessInfo(ctx, process.handle) | ||||
| 	events := processHcsResult(ctx, resultJSON) | ||||
| 	if err != nil { | ||||
| @ -307,6 +318,8 @@ func (process *Process) StdioLegacy() (_ io.WriteCloser, _ io.ReadCloser, _ io.R | ||||
| // Stdio returns the stdin, stdout, and stderr pipes, respectively. | ||||
| // To close them, close the process handle. | ||||
| func (process *Process) Stdio() (stdin io.Writer, stdout, stderr io.Reader) { | ||||
| 	process.stdioLock.Lock() | ||||
| 	defer process.stdioLock.Unlock() | ||||
| 	return process.stdin, process.stdout, process.stderr | ||||
| } | ||||
|  | ||||
| @ -340,9 +353,13 @@ func (process *Process) CloseStdin(ctx context.Context) error { | ||||
| 		return makeProcessError(process, operation, err, events) | ||||
| 	} | ||||
|  | ||||
| 	process.stdioLock.Lock() | ||||
| 	if process.stdin != nil { | ||||
| 		process.stdin.Close() | ||||
| 		process.stdin = nil | ||||
| 	} | ||||
| 	process.stdioLock.Unlock() | ||||
|  | ||||
| 	return nil | ||||
| } | ||||
|  | ||||
| @ -365,15 +382,20 @@ func (process *Process) Close() (err error) { | ||||
| 		return nil | ||||
| 	} | ||||
|  | ||||
| 	process.stdioLock.Lock() | ||||
| 	if process.stdin != nil { | ||||
| 		process.stdin.Close() | ||||
| 		process.stdin = nil | ||||
| 	} | ||||
| 	if process.stdout != nil { | ||||
| 		process.stdout.Close() | ||||
| 		process.stdout = nil | ||||
| 	} | ||||
| 	if process.stderr != nil { | ||||
| 		process.stderr.Close() | ||||
| 		process.stderr = nil | ||||
| 	} | ||||
| 	process.stdioLock.Unlock() | ||||
|  | ||||
| 	if err = process.unregisterCallback(ctx); err != nil { | ||||
| 		return makeProcessError(process, operation, err, nil) | ||||
|  | ||||
		Reference in New Issue
	
	Block a user