Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcontainers-common for
openSUSE:Factory checked in at 2021-08-24 10:53:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcontainers-common (Old)
and /work/SRC/openSUSE:Factory/.libcontainers-common.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcontainers-common"
Tue Aug 24 10:53:53 2021 rev:39 rq:908831 version:20210626
Changes:
--------
---
/work/SRC/openSUSE:Factory/libcontainers-common/libcontainers-common.changes
2021-07-02 13:27:12.476881227 +0200
+++
/work/SRC/openSUSE:Factory/.libcontainers-common.new.1899/libcontainers-common.changes
2021-08-24 10:54:04.972383725 +0200
@@ -1,0 +2,8 @@
+Fri Jul 23 08:31:52 UTC 2021 - Alexandre Vicenzi <alexandre.vice...@suse.com>
+
+- Update common to 0.41.0
+- Update podman to 3.2.3
+- Update storage to 1.32.6
+- Update image to 5.14.0
+
+-------------------------------------------------------------------
Old:
----
common-0.38.11.tar.xz
image-5.13.2.tar.xz
podman-3.2.2.tar.xz
storage-1.32.5.tar.xz
New:
----
common-0.41.0.tar.xz
image-5.14.0.tar.xz
podman-3.2.3.tar.xz
storage-1.32.6.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcontainers-common.spec ++++++
--- /var/tmp/diff_new_pack.Rdp2Bl/_old 2021-08-24 10:54:06.300381966 +0200
+++ /var/tmp/diff_new_pack.Rdp2Bl/_new 2021-08-24 10:54:06.304381961 +0200
@@ -17,16 +17,16 @@
# commonver - version from containers/common
-%define commonver 0.38.11
+%define commonver 0.41.0
# podman - version from containers/podman
-%define podmanver 3.2.2
+%define podmanver 3.2.3
# storagever - version from containers/storage
-%define storagever 1.32.5
+%define storagever 1.32.6
# imagever - version from containers/image
-%define imagever 5.13.2
+%define imagever 5.14.0
Name: libcontainers-common
Version: 20210626
++++++ _service ++++++
--- /var/tmp/diff_new_pack.Rdp2Bl/_old 2021-08-24 10:54:06.364381882 +0200
+++ /var/tmp/diff_new_pack.Rdp2Bl/_new 2021-08-24 10:54:06.364381882 +0200
@@ -3,7 +3,7 @@
<param name="url">https://github.com/containers/storage.git</param>
<param name="scm">git</param>
<param name="filename">storage</param>
- <param name="revision">v1.32.5</param>
+ <param name="revision">v1.32.6</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
@@ -11,7 +11,7 @@
<param name="url">https://github.com/containers/image.git</param>
<param name="scm">git</param>
<param name="filename">image</param>
- <param name="revision">v5.13.2</param>
+ <param name="revision">v5.14.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
@@ -19,7 +19,7 @@
<param name="url">https://github.com/containers/podman.git</param>
<param name="scm">git</param>
<param name="filename">podman</param>
- <param name="revision">v3.2.2</param>
+ <param name="revision">v3.2.3</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
@@ -27,7 +27,7 @@
<param name="url">https://github.com/containers/common.git</param>
<param name="scm">git</param>
<param name="filename">common</param>
- <param name="revision">v0.38.11</param>
+ <param name="revision">v0.41.0</param>
<param name="versionformat">@PARENT_TAG@</param>
<param name="versionrewrite-pattern">v(.*)</param>
</service>
++++++ common-0.38.11.tar.xz -> common-0.41.0.tar.xz ++++++
++++ 55537 lines of diff (skipped)
++++++ image-5.13.2.tar.xz -> image-5.14.0.tar.xz ++++++
++++ 5270 lines of diff (skipped)
++++++ podman-3.2.2.tar.xz -> podman-3.2.3.tar.xz ++++++
/work/SRC/openSUSE:Factory/libcontainers-common/podman-3.2.2.tar.xz
/work/SRC/openSUSE:Factory/.libcontainers-common.new.1899/podman-3.2.3.tar.xz
differ: char 13, line 1
++++++ storage-1.32.5.tar.xz -> storage-1.32.6.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/.gitignore
new/storage-1.32.6/.gitignore
--- old/storage-1.32.5/.gitignore 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,32 +0,0 @@
-# containers/storage project generated files to ignore
-# if you want to ignore files created by your editor/tools,
-# please consider a global .gitignore
https://help.github.com/articles/ignoring-files
-*.1
-*.5
-*.exe
-*~
-*.orig
-*.test
-.*.swp
-.DS_Store
-.idea*
-# a .bashrc may be added to customize the build environment
-.bashrc
-.gopath/
-docs/AWS_S3_BUCKET
-docs/GITCOMMIT
-docs/GIT_BRANCH
-docs/VERSION
-docs/_build
-docs/_static
-docs/_templates
-docs/changed-files
-# generated by man/md2man-all.sh
-man/man1
-man/man5
-man/man8
-tests/tools/build
-vendor/pkg/
-.vagrant
-/containers-storage
-/containers-storage.*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/VERSION new/storage-1.32.6/VERSION
--- old/storage-1.32.5/VERSION 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/VERSION 2021-07-09 19:42:03.000000000 +0200
@@ -1 +1 @@
-1.32.5
+1.32.6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/go.mod new/storage-1.32.6/go.mod
--- old/storage-1.32.5/go.mod 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/go.mod 2021-07-09 19:42:03.000000000 +0200
@@ -5,7 +5,7 @@
require (
github.com/BurntSushi/toml v0.3.1
github.com/Microsoft/go-winio v0.5.0
- github.com/Microsoft/hcsshim v0.8.17
+ github.com/Microsoft/hcsshim v0.8.20
github.com/docker/go-units v0.4.0
github.com/google/go-intervals v0.0.2
github.com/hashicorp/go-multierror v1.1.1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/go.sum new/storage-1.32.6/go.sum
--- old/storage-1.32.5/go.sum 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/go.sum 2021-07-09 19:42:03.000000000 +0200
@@ -54,8 +54,8 @@
github.com/Microsoft/hcsshim v0.8.14/go.mod
h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
github.com/Microsoft/hcsshim v0.8.15/go.mod
h1:x38A4YbHbdxJtc0sF6oIz+RG0npwSCAvn69iY6URG00=
github.com/Microsoft/hcsshim v0.8.16/go.mod
h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600=
-github.com/Microsoft/hcsshim v0.8.17
h1:yFHH5bghP9ij5Y34PPaMOE8g//oXZ0uJQeMENVo2zcI=
-github.com/Microsoft/hcsshim v0.8.17/go.mod
h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
+github.com/Microsoft/hcsshim v0.8.20
h1:ZTwcx3NS8n07kPf/JZ1qwU6vnjhVPMUWlXBF8r9UxrE=
+github.com/Microsoft/hcsshim v0.8.20/go.mod
h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4=
github.com/Microsoft/hcsshim/test v0.0.0-20201218223536-d3e5debf77da/go.mod
h1:5hlzMzRKMLyo42nCZ9oml8AdTlq/0cvIaBv6tK1RehU=
github.com/Microsoft/hcsshim/test v0.0.0-20210227013316-43a75bb4edd3/go.mod
h1:mw7qgWloBUl75W/gVH3cQszUg1+gUITj7D6NY7ywVnY=
github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod
h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/pkg/chunked/storage_linux.go
new/storage-1.32.6/pkg/chunked/storage_linux.go
--- old/storage-1.32.5/pkg/chunked/storage_linux.go 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/pkg/chunked/storage_linux.go 2021-07-09
19:42:03.000000000 +0200
@@ -160,7 +160,7 @@
continue
}
- srcDirfd, err := unix.Open(root, unix.O_RDONLY, 0)
+ srcDirfd, err := unix.Open(source, unix.O_RDONLY, 0)
if err != nil {
continue
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/pkg/fileutils/fileutils.go
new/storage-1.32.6/pkg/fileutils/fileutils.go
--- old/storage-1.32.5/pkg/fileutils/fileutils.go 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/pkg/fileutils/fileutils.go 2021-07-09
19:42:03.000000000 +0200
@@ -38,7 +38,7 @@
return nil, errors.New("illegal exclusion
pattern: \"!\"")
}
newp.exclusion = true
- p = p[1:]
+ p = strings.TrimPrefix(filepath.Clean(p[1:]), "/")
pm.exclusions = true
}
// Do some syntax checking on the pattern.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/pkg/fileutils/fileutils_test.go
new/storage-1.32.6/pkg/fileutils/fileutils_test.go
--- old/storage-1.32.5/pkg/fileutils/fileutils_test.go 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/pkg/fileutils/fileutils_test.go 2021-07-09
19:42:03.000000000 +0200
@@ -633,9 +633,11 @@
{[]string{"1", "2", "2"}, "2", 2, 0, true},
{[]string{"1", "2", "2", "2"}, "2", 3, 0, true},
{[]string{"/prefix/path", "/prefix/other"}, "/prefix/path", 1,
0, true},
- {[]string{"/prefix*", "/prefix/path"}, "/prefix/path", 2, 0,
true},
{[]string{"/prefix*", "!/prefix/path"}, "/prefix/match", 1, 0,
true},
- {[]string{"/prefix*", "!/prefix/path"}, "/prefix/path", 1, 1,
false},
+ {[]string{"/prefix*", "!/prefix/path"}, "/prefix/path", 1, 0,
true},
+ {[]string{"/prefix*", "!/prefix/path"}, "prefix/path", 0, 1,
false},
+ {[]string{"/prefix*", "!./prefix/path"}, "prefix/path", 0, 1,
false},
+ {[]string{"/prefix*", "!prefix/path"}, "prefix/path", 0, 1,
false},
}
for _, testCase := range testData {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/pkg/lockfile/lockfile_unix.go
new/storage-1.32.6/pkg/lockfile/lockfile_unix.go
--- old/storage-1.32.5/pkg/lockfile/lockfile_unix.go 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/pkg/lockfile/lockfile_unix.go 2021-07-09
19:42:03.000000000 +0200
@@ -5,6 +5,7 @@
import (
"fmt"
"os"
+ "path/filepath"
"sync"
"time"
@@ -33,11 +34,30 @@
// descriptor. Note that the path is opened read-only when ro is set. If ro
// is unset, openLock will open the path read-write and create the file if
// necessary.
-func openLock(path string, ro bool) (int, error) {
+func openLock(path string, ro bool) (fd int, err error) {
if ro {
- return unix.Open(path, os.O_RDONLY|unix.O_CLOEXEC, 0)
+ fd, err = unix.Open(path, os.O_RDONLY|unix.O_CLOEXEC, 0)
+ } else {
+ fd, err = unix.Open(path,
+ os.O_RDWR|unix.O_CLOEXEC|os.O_CREATE,
+ unix.S_IRUSR|unix.S_IWUSR|unix.S_IRGRP|unix.S_IROTH,
+ )
}
- return unix.Open(path, os.O_RDWR|unix.O_CLOEXEC|os.O_CREATE,
unix.S_IRUSR|unix.S_IWUSR|unix.S_IRGRP|unix.S_IROTH)
+
+ if err == nil {
+ return
+ }
+
+ // the directory of the lockfile seems to be removed, try to create it
+ if os.IsNotExist(err) {
+ if err := os.MkdirAll(filepath.Dir(path), 0700); err != nil {
+ return fd, errors.Wrap(err, "creating locker directory")
+ }
+
+ return openLock(path, ro)
+ }
+
+ return
}
// createLockerForPath returns a Locker object, possibly (depending on the
platform)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/pkg/lockfile/lockfile_unix_test.go
new/storage-1.32.6/pkg/lockfile/lockfile_unix_test.go
--- old/storage-1.32.5/pkg/lockfile/lockfile_unix_test.go 1970-01-01
01:00:00.000000000 +0100
+++ new/storage-1.32.6/pkg/lockfile/lockfile_unix_test.go 2021-07-09
19:42:03.000000000 +0200
@@ -0,0 +1,65 @@
+// +build linux solaris darwin freebsd
+
+package lockfile
+
+import (
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestOpenLock(t *testing.T) {
+ t.Parallel()
+
+ for _, tc := range []struct {
+ name string
+ prepare func() (path string, readOnly bool)
+ }{
+ {
+ name: "file exists (read/write)",
+ prepare: func() (string, bool) {
+ tempFile, err := ioutil.TempFile("", "lock-")
+ require.NoError(t, err)
+ return tempFile.Name(), false
+ },
+ },
+ {
+ name: "file exists readonly (readonly)",
+ prepare: func() (string, bool) {
+ tempFile, err := ioutil.TempFile("", "lock-")
+ require.NoError(t, err)
+ return tempFile.Name(), true
+ },
+ },
+ {
+ name: "base dir exists (read/write)",
+ prepare: func() (string, bool) {
+ tempDir := os.TempDir()
+ require.DirExists(t, tempDir)
+ return filepath.Join(tempDir, "test-1.lock"),
false
+ },
+ },
+ {
+ name: "base dir not exists (read/write)",
+ prepare: func() (string, bool) {
+ tempDir, err := ioutil.TempDir("", "lock-")
+ require.NoError(t, err)
+ return filepath.Join(tempDir, "subdir",
"test-1.lock"), false
+ },
+ },
+ } {
+ path, readOnly := tc.prepare()
+
+ _, err := openLock(path, readOnly)
+
+ require.NoError(t, err, tc.name)
+
+ _, err = openLock(path, readOnly)
+ require.NoError(t, err)
+
+ require.Nil(t, os.RemoveAll(path))
+ }
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/tests/tools/vendor/github.com/cpuguy83/go-md2man/.gitignore
new/storage-1.32.6/tests/tools/vendor/github.com/cpuguy83/go-md2man/.gitignore
---
old/storage-1.32.5/tests/tools/vendor/github.com/cpuguy83/go-md2man/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++
new/storage-1.32.6/tests/tools/vendor/github.com/cpuguy83/go-md2man/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-go-md2man
-bin
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/tests/tools/vendor/github.com/russross/blackfriday/.gitignore
new/storage-1.32.6/tests/tools/vendor/github.com/russross/blackfriday/.gitignore
---
old/storage-1.32.5/tests/tools/vendor/github.com/russross/blackfriday/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++
new/storage-1.32.6/tests/tools/vendor/github.com/russross/blackfriday/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-*.out
-*.swp
-*.8
-*.6
-_obj
-_test*
-markdown
-tags
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/tests/tools/vendor/github.com/sirupsen/logrus/.gitignore
new/storage-1.32.6/tests/tools/vendor/github.com/sirupsen/logrus/.gitignore
--- old/storage-1.32.5/tests/tools/vendor/github.com/sirupsen/logrus/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/tests/tools/vendor/github.com/sirupsen/logrus/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-logrus
-vendor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/tests/tools/vendor/github.com/vbatts/git-validation/.gitignore
new/storage-1.32.6/tests/tools/vendor/github.com/vbatts/git-validation/.gitignore
---
old/storage-1.32.5/tests/tools/vendor/github.com/vbatts/git-validation/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++
new/storage-1.32.6/tests/tools/vendor/github.com/vbatts/git-validation/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-*~
-git-validation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/tests/tools/vendor/golang.org/x/sys/unix/.gitignore
new/storage-1.32.6/tests/tools/vendor/golang.org/x/sys/unix/.gitignore
--- old/storage-1.32.5/tests/tools/vendor/golang.org/x/sys/unix/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/tests/tools/vendor/golang.org/x/sys/unix/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-_obj/
-unix.test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/types/options.go
new/storage-1.32.6/types/options.go
--- old/storage-1.32.5/types/options.go 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/types/options.go 2021-07-09 19:42:03.000000000 +0200
@@ -2,7 +2,6 @@
import (
"fmt"
- "io/ioutil"
"os"
"os/exec"
"path/filepath"
@@ -272,21 +271,21 @@
// ReloadConfigurationFile parses the specified configuration file and
overrides
// the configuration in storeOptions.
func ReloadConfigurationFile(configFile string, storeOptions *StoreOptions) {
- data, err := ioutil.ReadFile(configFile)
- if err != nil {
+ config := new(tomlConfig)
+
+ meta, err := toml.DecodeFile(configFile, &config)
+ if err == nil {
+ keys := meta.Undecoded()
+ if len(keys) > 0 {
+ logrus.Warningf("Failed to decode the keys %q from
%q.", keys, configFile)
+ }
+ } else {
if !os.IsNotExist(err) {
fmt.Printf("Failed to read %s %v\n", configFile,
err.Error())
return
}
}
- config := new(tomlConfig)
-
- if _, err := toml.Decode(string(data), config); err != nil {
- fmt.Printf("Failed to parse %s %v\n", configFile, err.Error())
- return
- }
-
// Clear storeOptions of previos settings
*storeOptions = StoreOptions{}
if config.Storage.Driver != "" {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/types/options_test.go
new/storage-1.32.6/types/options_test.go
--- old/storage-1.32.5/types/options_test.go 2021-06-25 02:23:24.000000000
+0200
+++ new/storage-1.32.6/types/options_test.go 2021-07-09 19:42:03.000000000
+0200
@@ -1,11 +1,14 @@
package types
import (
+ "bytes"
"fmt"
"os"
"path/filepath"
+ "strings"
"testing"
+ "github.com/sirupsen/logrus"
"gotest.tools/assert"
)
@@ -110,3 +113,14 @@
assert.NilError(t, err)
assert.Equal(t, storageOpts.GraphRoot, expectedPath)
}
+
+func TestReloadConfigurationFile(t *testing.T) {
+ content := bytes.NewBufferString("")
+ logrus.SetOutput(content)
+ var storageOpts StoreOptions
+ ReloadConfigurationFile("./storage_broken.conf", &storageOpts)
+ assert.Equal(t, storageOpts.RunRoot, "/run/containers/test")
+ logrus.SetOutput(os.Stderr)
+
+ assert.Equal(t, strings.Contains(content.String(), "Failed to decode
the keys [\\\"foo\\\" \\\"storage.options.graphroot\\\"] from
\\\"./storage_broken.conf\\\".\""), true)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/types/storage_broken.conf
new/storage-1.32.6/types/storage_broken.conf
--- old/storage-1.32.5/types/storage_broken.conf 1970-01-01
01:00:00.000000000 +0100
+++ new/storage-1.32.6/types/storage_broken.conf 2021-07-09
19:42:03.000000000 +0200
@@ -0,0 +1,18 @@
+# This file is is a TEST configuration file for all tools
+# that use the containers/storage library.
+# See man 5 containers-storage.conf for more information
+# The "container storage" table contains all of the server options.
+foo = "bar"
+
+[storage]
+
+# Default Storage Driver
+driver = ""
+
+# Temporary storage location
+runroot = "/run/containers/test"
+
+[storage.options]
+# Primary Read/Write location of container storage
+graphroot = "/var/lib/containers/storage"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/types/utils.go
new/storage-1.32.6/types/utils.go
--- old/storage-1.32.5/types/utils.go 2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/types/utils.go 2021-07-09 19:42:03.000000000 +0200
@@ -2,7 +2,6 @@
import (
"fmt"
- "io/ioutil"
"os"
"path/filepath"
"strconv"
@@ -75,12 +74,9 @@
return runtimeDir, nil
}
- initCommand, err := ioutil.ReadFile(env.getProcCommandFile())
- if err != nil || string(initCommand) == "systemd" {
- runUserDir := env.getRunUserDir()
- if isRootlessRuntimeDirOwner(runUserDir, env) {
- return runUserDir, nil
- }
+ runUserDir := env.getRunUserDir()
+ if isRootlessRuntimeDirOwner(runUserDir, env) {
+ return runUserDir, nil
}
tmpPerUserDir := env.getTmpPerUserDir()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/BurntSushi/toml/.gitignore
new/storage-1.32.6/vendor/github.com/BurntSushi/toml/.gitignore
--- old/storage-1.32.5/vendor/github.com/BurntSushi/toml/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/BurntSushi/toml/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-TAGS
-tags
-.*.swp
-tomlcheck/tomlcheck
-toml.test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/Microsoft/go-winio/.gitignore
new/storage-1.32.6/vendor/github.com/Microsoft/go-winio/.gitignore
--- old/storage-1.32.5/vendor/github.com/Microsoft/go-winio/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/Microsoft/go-winio/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-*.exe
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/.gitignore
new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/.gitignore
--- old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-*.exe
-.idea
-.vscode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/errors.go
new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/errors.go
--- old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/errors.go
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/errors.go
2021-07-09 19:42:03.000000000 +0200
@@ -59,7 +59,7 @@
// ErrVmcomputeOperationInvalidState is an error encountered when the
compute system is not in a valid state for the requested operation
ErrVmcomputeOperationInvalidState =
hcs.ErrVmcomputeOperationInvalidState
- // ErrProcNotFound is an error encountered when the the process cannot
be found
+ // ErrProcNotFound is an error encountered when a procedure look up
fails.
ErrProcNotFound = hcs.ErrProcNotFound
// ErrVmcomputeOperationAccessIsDenied is an error which can be
encountered when enumerating compute systems in RS1/RS2
@@ -159,7 +159,7 @@
// IsNotExist checks if an error is caused by the Container or Process not
existing.
// Note: Currently, ErrElementNotFound can mean that a Process has either
// already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
-// will currently return true when the error is ErrElementNotFound or
ErrProcNotFound.
+// will currently return true when the error is ErrElementNotFound.
func IsNotExist(err error) bool {
if _, ok := err.(EndpointNotFoundError); ok {
return true
@@ -192,7 +192,7 @@
// a Container or Process being already stopped.
// Note: Currently, ErrElementNotFound can mean that a Process has either
// already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
-// will currently return true when the error is ErrElementNotFound or
ErrProcNotFound.
+// will currently return true when the error is ErrElementNotFound.
func IsAlreadyStopped(err error) bool {
return hcs.IsAlreadyStopped(getInnerError(err))
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/internal/hcs/errors.go
new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/internal/hcs/errors.go
---
old/storage-1.32.5/vendor/github.com/Microsoft/hcsshim/internal/hcs/errors.go
2021-06-25 02:23:24.000000000 +0200
+++
new/storage-1.32.6/vendor/github.com/Microsoft/hcsshim/internal/hcs/errors.go
2021-07-09 19:42:03.000000000 +0200
@@ -60,7 +60,7 @@
// ErrVmcomputeOperationInvalidState is an error encountered when the
compute system is not in a valid state for the requested operation
ErrVmcomputeOperationInvalidState = syscall.Errno(0xc0370105)
- // ErrProcNotFound is an error encountered when the the process cannot
be found
+ // ErrProcNotFound is an error encountered when a procedure look up
fails.
ErrProcNotFound = syscall.Errno(0x7f)
// ErrVmcomputeOperationAccessIsDenied is an error which can be
encountered when enumerating compute systems in RS1/RS2
@@ -242,12 +242,11 @@
// IsNotExist checks if an error is caused by the Container or Process not
existing.
// Note: Currently, ErrElementNotFound can mean that a Process has either
// already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
-// will currently return true when the error is ErrElementNotFound or
ErrProcNotFound.
+// will currently return true when the error is ErrElementNotFound.
func IsNotExist(err error) bool {
err = getInnerError(err)
return err == ErrComputeSystemDoesNotExist ||
- err == ErrElementNotFound ||
- err == ErrProcNotFound
+ err == ErrElementNotFound
}
// IsAlreadyClosed checks if an error is caused by the Container or Process
having been
@@ -278,12 +277,11 @@
// a Container or Process being already stopped.
// Note: Currently, ErrElementNotFound can mean that a Process has either
// already exited, or does not exist. Both IsAlreadyStopped and IsNotExist
-// will currently return true when the error is ErrElementNotFound or
ErrProcNotFound.
+// will currently return true when the error is ErrElementNotFound.
func IsAlreadyStopped(err error) bool {
err = getInnerError(err)
return err == ErrVmcomputeAlreadyStopped ||
- err == ErrElementNotFound ||
- err == ErrProcNotFound
+ err == ErrElementNotFound
}
// IsNotSupported returns a boolean indicating whether the error is caused by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/bits-and-blooms/bitset/.gitignore
new/storage-1.32.6/vendor/github.com/bits-and-blooms/bitset/.gitignore
--- old/storage-1.32.5/vendor/github.com/bits-and-blooms/bitset/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/bits-and-blooms/bitset/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,26 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-
-target
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/golang/snappy/.gitignore
new/storage-1.32.6/vendor/github.com/golang/snappy/.gitignore
--- old/storage-1.32.5/vendor/github.com/golang/snappy/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/golang/snappy/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-cmd/snappytool/snappytool
-testdata/bench
-
-# These explicitly listed benchmark data files are for an obsolete version of
-# snappy_test.go.
-testdata/alice29.txt
-testdata/asyoulik.txt
-testdata/fireworks.jpeg
-testdata/geo.protodata
-testdata/html
-testdata/html_x_4
-testdata/kppkn.gtb
-testdata/lcet10.txt
-testdata/paper-100k.pdf
-testdata/plrabn12.txt
-testdata/urls.10K
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/json-iterator/go/.gitignore
new/storage-1.32.6/vendor/github.com/json-iterator/go/.gitignore
--- old/storage-1.32.5/vendor/github.com/json-iterator/go/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/json-iterator/go/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-/vendor
-/bug_test.go
-/coverage.txt
-/.idea
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/klauspost/compress/huff0/.gitignore
new/storage-1.32.6/vendor/github.com/klauspost/compress/huff0/.gitignore
--- old/storage-1.32.5/vendor/github.com/klauspost/compress/huff0/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/klauspost/compress/huff0/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/huff0-fuzz.zip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/klauspost/pgzip/.gitignore
new/storage-1.32.6/vendor/github.com/klauspost/pgzip/.gitignore
--- old/storage-1.32.5/vendor/github.com/klauspost/pgzip/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/klauspost/pgzip/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/mistifyio/go-zfs/.gitignore
new/storage-1.32.6/vendor/github.com/mistifyio/go-zfs/.gitignore
--- old/storage-1.32.5/vendor/github.com/mistifyio/go-zfs/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/mistifyio/go-zfs/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-.vagrant
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/modern-go/concurrent/.gitignore
new/storage-1.32.6/vendor/github.com/modern-go/concurrent/.gitignore
--- old/storage-1.32.5/vendor/github.com/modern-go/concurrent/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/modern-go/concurrent/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/coverage.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/modern-go/reflect2/.gitignore
new/storage-1.32.6/vendor/github.com/modern-go/reflect2/.gitignore
--- old/storage-1.32.5/vendor/github.com/modern-go/reflect2/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/modern-go/reflect2/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-/vendor
-/coverage.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/pkg/errors/.gitignore
new/storage-1.32.6/vendor/github.com/pkg/errors/.gitignore
--- old/storage-1.32.5/vendor/github.com/pkg/errors/.gitignore 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/pkg/errors/.gitignore 1970-01-01
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/sirupsen/logrus/.gitignore
new/storage-1.32.6/vendor/github.com/sirupsen/logrus/.gitignore
--- old/storage-1.32.5/vendor/github.com/sirupsen/logrus/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/sirupsen/logrus/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-logrus
-vendor
-
-.idea/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/github.com/ulikunitz/xz/.gitignore
new/storage-1.32.6/vendor/github.com/ulikunitz/xz/.gitignore
--- old/storage-1.32.5/vendor/github.com/ulikunitz/xz/.gitignore
2021-06-25 02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/github.com/ulikunitz/xz/.gitignore
1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-# .gitignore
-
-TODO.html
-README.html
-
-lzma/writer.txt
-lzma/reader.txt
-
-cmd/gxz/gxz
-cmd/xb/xb
-
-# test executables
-*.test
-
-# profile files
-*.out
-
-# vim swap file
-.*.swp
-
-# executables on windows
-*.exe
-
-# default compression test file
-enwik8*
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/vendor/go.opencensus.io/.gitignore
new/storage-1.32.6/vendor/go.opencensus.io/.gitignore
--- old/storage-1.32.5/vendor/go.opencensus.io/.gitignore 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/go.opencensus.io/.gitignore 1970-01-01
01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-/.idea/
-
-# go.opencensus.io/exporter/aws
-/exporter/aws/
-
-# Exclude vendor, use dep ensure after checkout:
-/vendor/github.com/
-/vendor/golang.org/
-/vendor/google.golang.org/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/storage-1.32.5/vendor/golang.org/x/sys/unix/.gitignore
new/storage-1.32.6/vendor/golang.org/x/sys/unix/.gitignore
--- old/storage-1.32.5/vendor/golang.org/x/sys/unix/.gitignore 2021-06-25
02:23:24.000000000 +0200
+++ new/storage-1.32.6/vendor/golang.org/x/sys/unix/.gitignore 1970-01-01
01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-_obj/
-unix.test
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/storage-1.32.5/vendor/modules.txt
new/storage-1.32.6/vendor/modules.txt
--- old/storage-1.32.5/vendor/modules.txt 2021-06-25 02:23:24.000000000
+0200
+++ new/storage-1.32.6/vendor/modules.txt 2021-07-09 19:42:03.000000000
+0200
@@ -8,7 +8,7 @@
github.com/Microsoft/go-winio/pkg/guid
github.com/Microsoft/go-winio/pkg/security
github.com/Microsoft/go-winio/vhd
-# github.com/Microsoft/hcsshim v0.8.17
+# github.com/Microsoft/hcsshim v0.8.20
## explicit
github.com/Microsoft/hcsshim
github.com/Microsoft/hcsshim/computestorage
