From 0e87d4d1ca1a02f4c230ef77de87a5bb2da42be4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Sat, 21 Aug 2021 20:15:40 +0200
Subject: [PATCH] Run (gofmt -s -w)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Go 1.17 introduces a much more reasonable build constraint format, and gofmt now fails without using it.

Sadly we still need the old format as well, to support <1.17 builds.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 cmd/skopeo/cgo_pthread_ordering_workaround.go | 1 +
 cmd/skopeo/unshare.go                         | 1 +
 integration/openshift_shell_test.go           | 1 +
 3 files changed, 3 insertions(+)

diff --git a/cmd/skopeo/cgo_pthread_ordering_workaround.go b/cmd/skopeo/cgo_pthread_ordering_workaround.go
index b19ee1b5f6..c52aeb1395 100644
--- a/cmd/skopeo/cgo_pthread_ordering_workaround.go
+++ b/cmd/skopeo/cgo_pthread_ordering_workaround.go
@@ -1,3 +1,4 @@
+//go:build !containers_image_openpgp
 // +build !containers_image_openpgp
 
 package main
diff --git a/cmd/skopeo/unshare.go b/cmd/skopeo/unshare.go
index acb2f29aea..621bc4bec9 100644
--- a/cmd/skopeo/unshare.go
+++ b/cmd/skopeo/unshare.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package main
diff --git a/integration/openshift_shell_test.go b/integration/openshift_shell_test.go
index ad635d3629..8e67a9995f 100644
--- a/integration/openshift_shell_test.go
+++ b/integration/openshift_shell_test.go
@@ -1,3 +1,4 @@
+//go:build openshift_shell
 // +build openshift_shell
 
 package main