Hello community, here is the log from the commit of package cri-o for openSUSE:Factory checked in at 2018-10-11 11:44:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cri-o (Old) and /work/SRC/openSUSE:Factory/.cri-o.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cri-o" Thu Oct 11 11:44:48 2018 rev:18 rq:640756 version:1.11.2 Changes: -------- --- /work/SRC/openSUSE:Factory/cri-o/cri-o.changes 2018-09-05 13:45:10.673926359 +0200 +++ /work/SRC/openSUSE:Factory/.cri-o.new/cri-o.changes 2018-10-11 11:45:01.866818934 +0200 @@ -1,0 +2,35 @@ +Mon Oct 8 15:06:24 UTC 2018 - Jeff Kowalczyk <[email protected]> + +- Add go-1.11-compat-backport.patch for go1.11 compatibility. + * Tested with golang(API) == 1.10 and golang(API) == 1.11, OK + * Upstream git master commit + https://github.com/kubernetes-sigs/cri-o/commit/0bd30872028b5ed2d0eb7febb39f034b5f2da72a + contains 1 hunk adding missing argument in format string of + calls to: + + # github.com/kubernetes-incubator/cri-o/lib + lib/container_server.go:309: Debugf call needs 1 arg but has 2 args + lib/container_server.go:317: Debugf call needs 1 arg but has 2 args + ... + FAIL github.com/kubernetes-incubator/cri-o/lib [build failed] + + Calls in question: + + logrus.Debugf("loaded new pod sandbox %s", sandboxID, err) + logrus.Debugf("loaded new pod container %s", containerID, err) + + require another argument to the string format (": %v" per upstream): + + logrus.Debugf("loaded new pod sandbox %s: %v", sandboxID, err) + logrus.Debugf("loaded new pod container %s: %v", containerID, err) + + Patch contents not available in upstream cri-o released versions: + cri-o-1.11.3 + cri-o-1.11.4 + cri-o-1.11.5 + cri-o-1.11.6 + + Filed upstream issue requesting patch contents in released version: + https://github.com/kubernetes-sigs/cri-o/issues/1827 + +------------------------------------------------------------------- New: ---- go-1.11-compat-backport.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cri-o.spec ++++++ --- /var/tmp/diff_new_pack.EUCerY/_old 2018-10-11 11:45:03.466816898 +0200 +++ /var/tmp/diff_new_pack.EUCerY/_new 2018-10-11 11:45:03.470816893 +0200 @@ -44,6 +44,7 @@ Source3: %{name_source3} Source4: cri-o-rpmlintrc Source5: kubelet.env +Patch0: go-1.11-compat-backport.patch BuildRequires: device-mapper-devel BuildRequires: fdupes BuildRequires: git-core @@ -94,6 +95,7 @@ %prep %setup -q +%patch0 %build # We can't use symlinks here because go-list gets confused by symlinks, so we ++++++ go-1.11-compat-backport.patch ++++++ --- lib/container_server.go.orig 2018-08-16 14:34:51.000000000 -0700 +++ lib/container_server.go 2018-10-05 12:28:47.081370224 -0700 @@ -306,7 +306,7 @@ func (c *ContainerServer) Update() error if err = c.LoadSandbox(sandboxID); err != nil { logrus.Warnf("could not load new pod sandbox %s: %v, ignoring", sandboxID, err) } else { - logrus.Debugf("loaded new pod sandbox %s", sandboxID, err) + logrus.Debugf("loaded new pod sandbox %s: %v", sandboxID, err) } } for containerID := range newPodContainers { @@ -314,7 +314,7 @@ func (c *ContainerServer) Update() error if err = c.LoadContainer(containerID); err != nil { logrus.Warnf("could not load new sandbox container %s: %v, ignoring", containerID, err) } else { - logrus.Debugf("loaded new pod container %s", containerID, err) + logrus.Debugf("loaded new pod container %s: %v", containerID, err) } } return nil
