containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1758 from ygalblum/check-report-writer 

Image copier: make sure ReportWriter is not nil before accessing
This commit is contained in:
openshift-merge-bot[bot] 2023-12-04 12:49:12 +00:00 committed by GitHub
parent b89e527ab7 a525f15fc3
commit 1b45ca4b5f
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/libimage/copier.go
View File

@ -364,11 +364,13 @@ func (c *copier) copy(ctx context.Context, source, destination types.ImageRefere
defer cancel() defer cancel()
defer timer.Stop() defer timer.Stop()
fmt.Fprintf(c.imageCopyOptions.ReportWriter, if c.imageCopyOptions.ReportWriter != nil {
"Pulling image %s inside systemd: setting pull timeout to %s\n", fmt.Fprintf(c.imageCopyOptions.ReportWriter,
source.StringWithinTransport(), "Pulling image %s inside systemd: setting pull timeout to %s\n",
time.Duration(numExtensions)*extension, source.StringWithinTransport(),
) time.Duration(numExtensions)*extension,
)
}
// From `man systemd.service(5)`: // From `man systemd.service(5)`:
// //