Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package minio-client for openSUSE:Factory checked in at 2022-04-02 18:20:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/minio-client (Old) and /work/SRC/openSUSE:Factory/.minio-client.new.1900 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "minio-client" Sat Apr 2 18:20:54 2022 rev:2 rq:966530 version:20220401T234448Z Changes: -------- --- /work/SRC/openSUSE:Factory/minio-client/minio-client.changes 2022-03-31 17:19:13.132913256 +0200 +++ /work/SRC/openSUSE:Factory/.minio-client.new.1900/minio-client.changes 2022-04-02 18:21:11.865832470 +0200 @@ -1,0 +2,7 @@ +Sat Apr 02 11:39:55 UTC 2022 - [email protected] + +- Update to version 20220401T234448Z: + * `mc rm --non-current should remove top level deletemarker (#4037) + * Make sure to print `mc rm` dry run message (#4033) + +------------------------------------------------------------------- Old: ---- mc-20220331T045530Z.tar.gz New: ---- mc-20220401T234448Z.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ minio-client.spec ++++++ --- /var/tmp/diff_new_pack.GgM5L1/_old 2022-04-02 18:21:12.893820931 +0200 +++ /var/tmp/diff_new_pack.GgM5L1/_new 2022-04-02 18:21:12.897820885 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mc +# spec file for package minio-client # # Copyright (c) 2022 SUSE LLC # @@ -22,10 +22,10 @@ %define binary_name minio-client Name: minio-client -Version: 20220331T045530Z +Version: 20220401T234448Z Release: 0 Summary: Client for MinIO -License: AGPL-3.0 +License: AGPL-3.0-only URL: https://github.com/minio/mc Source: %{archive_name}-%{version}.tar.gz Source1: vendor.tar.gz ++++++ _service ++++++ --- /var/tmp/diff_new_pack.GgM5L1/_old 2022-04-02 18:21:12.933820481 +0200 +++ /var/tmp/diff_new_pack.GgM5L1/_new 2022-04-02 18:21:12.937820437 +0200 @@ -5,7 +5,7 @@ <param name="exclude">.git</param> <param name="changesgenerate">enable</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">RELEASE.2022-03-31T04-55-30Z</param> + <param name="revision">RELEASE.2022-04-01T23-44-48Z</param> <param name="match-tag">RELEASE.*</param> <param name="versionrewrite-pattern">RELEASE\.(.*)-(.*)-(.*)-(.*)-(.*)</param> <param name="versionrewrite-replacement">\1\2\3\4\5</param> @@ -21,7 +21,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="disabled"> - <param name="archive">mc-20220331T045530Z.tar.gz</param> + <param name="archive">mc-20220401T234448Z.tar.gz</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.GgM5L1/_old 2022-04-02 18:21:12.957820212 +0200 +++ /var/tmp/diff_new_pack.GgM5L1/_new 2022-04-02 18:21:12.961820167 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/minio/mc</param> - <param name="changesrevision">8eae2e3bbfafe952ecb33904c0d9073871a32169</param></service></servicedata> + <param name="changesrevision">5a3ad93ab94b8517528470269a4e0bb4f628f154</param></service></servicedata> (No newline at EOF) ++++++ mc-20220331T045530Z.tar.gz -> mc-20220401T234448Z.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mc-20220331T045530Z/cmd/rm-main.go new/mc-20220401T234448Z/cmd/rm-main.go --- old/mc-20220331T045530Z/cmd/rm-main.go 2022-03-31 01:21:42.000000000 +0200 +++ new/mc-20220401T234448Z/cmd/rm-main.go 2022-04-02 01:39:16.000000000 +0200 @@ -159,7 +159,8 @@ 13. Remove all object versions older than one year. {{.Prompt}} {{.HelpName}} s3/docs/ --recursive --versions --rewind 365d - 14. Perform a fake removal of object(s) versions that are non-current and older than 10 days. + 14. Perform a fake removal of object(s) versions that are non-current and older than 10 days. If top-level version is a delete + marker, this will also be deleted when --non-current flag is specified. {{.Prompt}} {{.HelpName}} s3/docs/ --recursive --force --versions --non-current --older-than 10d --dry-run `, } @@ -364,6 +365,17 @@ encKeyDB map[string][]prefixSSEPair } +func printDryRunMsg(content *ClientContent) { + if globalJSON { + return + } + if content.VersionID != "" { + fmt.Println("DRYRUN: Removing ", content.URL.Path, "version:", content.VersionID) + return + } + fmt.Println("DRYRUN: Removing ", content.URL.Path) +} + // listAndRemove uses listing before removal, it can list recursively or not, with versions or not. // Use cases: // * Remove objects recursively @@ -387,7 +399,6 @@ listOpts.WithDeleteMarkers = true listOpts.TimeRef = opts.timeRef } - atLeastOneObjectFound := false resultCh := clnt.Remove(ctx, opts.isIncomplete, isRemoveBucket, opts.isBypass, contentCh) @@ -425,7 +436,7 @@ if lastPath != content.URL.Path { lastPath = content.URL.Path for _, content := range perObjectVersions { - if content.IsLatest { + if content.IsLatest && !content.IsDeleteMarker { continue } if !content.Time.IsZero() { @@ -444,7 +455,7 @@ } if opts.isFake { - fmt.Println("DRYRUN: Removing ", content.URL.Path, "version:", content.VersionID) + printDryRunMsg(content) continue } @@ -529,12 +540,14 @@ }) } } + } else { + printDryRunMsg(content) } } if opts.nonCurrentVersion && opts.isRecursive && opts.withVersions { for _, content := range perObjectVersions { - if content.IsLatest { + if content.IsLatest && !content.IsDeleteMarker { continue } if !content.Time.IsZero() { @@ -553,7 +566,7 @@ } if opts.isFake { - fmt.Println("DRYRUN: Removing ", content.URL.Path, "version:", content.VersionID) + printDryRunMsg(content) continue } ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/minio-client/vendor.tar.gz /work/SRC/openSUSE:Factory/.minio-client.new.1900/vendor.tar.gz differ: char 5, line 1
