From c1b9f17b00aebc818451b76b70f15776b1ba337d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 11 Feb 2026 03:04:09 +0000 Subject: [PATCH 01/15] Bump the all group across 1 directory with 3 updates Bumps the all group with 3 updates in the / directory: [github.com/essentialkaos/ek/v13](https://github.com/essentialkaos/ek), [github.com/klauspost/compress](https://github.com/klauspost/compress) and [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3). Updates `github.com/essentialkaos/ek/v13` from 13.38.3 to 13.38.5 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v13.38.3...v13.38.5) Updates `github.com/klauspost/compress` from 1.18.3 to 1.18.4 - [Release notes](https://github.com/klauspost/compress/releases) - [Commits](https://github.com/klauspost/compress/compare/v1.18.3...v1.18.4) Updates `github.com/mattn/go-sqlite3` from 1.14.33 to 1.14.34 - [Release notes](https://github.com/mattn/go-sqlite3/releases) - [Commits](https://github.com/mattn/go-sqlite3/compare/v1.14.33...v1.14.34) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v13 dependency-version: 13.38.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/klauspost/compress dependency-version: 1.18.4 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/mattn/go-sqlite3 dependency-version: 1.14.34 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 6 +++--- go.sum | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 217dd67b..79c3b97a 100644 --- a/go.mod +++ b/go.mod @@ -5,9 +5,9 @@ go 1.24.0 require ( github.com/ProtonMail/go-crypto v1.0.0 github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v13 v13.38.3 - github.com/klauspost/compress v1.18.3 - github.com/mattn/go-sqlite3 v1.14.33 + github.com/essentialkaos/ek/v13 v13.38.5 + github.com/klauspost/compress v1.18.4 + github.com/mattn/go-sqlite3 v1.14.34 github.com/sassoftware/go-rpmutils v0.4.0 github.com/ulikunitz/xz v0.5.15 ) diff --git a/go.sum b/go.sum index e0ed08a7..ecaf59c5 100644 --- a/go.sum +++ b/go.sum @@ -13,20 +13,18 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8= github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM= -github.com/essentialkaos/ek/v13 v13.38.2 h1:gdlHlxbm+alUnXvCkz5W8rJ6dMs+BZz+2FPxetFZDyY= -github.com/essentialkaos/ek/v13 v13.38.2/go.mod h1:qS5hOA6BaVYCS+nstm6l502Ehkb8i5PaN5nd40fbUg0= -github.com/essentialkaos/ek/v13 v13.38.3 h1:gQVNC6RdSBBYFhmtN9QOCZbshm+ib0PO2b9O0C7JMWc= -github.com/essentialkaos/ek/v13 v13.38.3/go.mod h1:qS5hOA6BaVYCS+nstm6l502Ehkb8i5PaN5nd40fbUg0= +github.com/essentialkaos/ek/v13 v13.38.5 h1:OhotWDZeM5lnUcz9Ioa/Ak1J+Fm6apdSP4jipCrk1d4= +github.com/essentialkaos/ek/v13 v13.38.5/go.mod h1:qS5hOA6BaVYCS+nstm6l502Ehkb8i5PaN5nd40fbUg0= github.com/essentialkaos/go-linenoise/v3 v3.7.0 h1:a/DzU6GFBmrKJxNAzaYbLGN6yFnIMIFaWxvSWmeCEp0= github.com/essentialkaos/go-linenoise/v3 v3.7.0/go.mod h1:IhOWE0rvvu3aPmGko/C4SoZdhbko9eTuwe5yyw7/uQ8= -github.com/klauspost/compress v1.18.3 h1:9PJRvfbmTabkOX8moIpXPbMMbYN60bWImDDU7L+/6zw= -github.com/klauspost/compress v1.18.3/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= +github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-sqlite3 v1.14.33 h1:A5blZ5ulQo2AtayQ9/limgHEkFreKj1Dv226a1K73s0= -github.com/mattn/go-sqlite3 v1.14.33/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.34 h1:3NtcvcUnFBPsuRcno8pUtupspG/GM+9nZ88zgJcp6Zk= +github.com/mattn/go-sqlite3 v1.14.34/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= From 0daefb3504ee6decd91dde90dcbf98e5faad6cf4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Feb 2026 03:03:26 +0000 Subject: [PATCH 02/15] Bump actions/download-artifact from 7 to 8 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 7 to 8. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v7...v8) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-version: '8' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1232357a..89e516b4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,7 @@ jobs: cache: false - name: Download pre-built artifacts - uses: actions/download-artifact@v7 + uses: actions/download-artifact@v8 with: name: createrepo_c path: ${{github.workspace}}/.local/bin From f4ed785dac527c809f261e06c175442ffad7954f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Feb 2026 03:03:30 +0000 Subject: [PATCH 03/15] Bump actions/upload-artifact from 6 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v6...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1232357a..6f6788cf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,7 @@ jobs: run: createrepo_c --version - name: Upload built artifacts - uses: actions/upload-artifact@v6 + uses: actions/upload-artifact@v7 with: name: createrepo_c path: ${{github.workspace}}/.local/bin/createrepo_c From 38d50f2ebd71373f77155a84398b2375d018faba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Mar 2026 03:03:56 +0000 Subject: [PATCH 04/15] Bump docker/login-action from 3 to 4 Bumps [docker/login-action](https://github.com/docker/login-action) from 3 to 4. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v3...v4) --- updated-dependencies: - dependency-name: docker/login-action dependency-version: '4' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cd-release.yml | 4 ++-- .github/workflows/ci-pr.yml | 4 ++-- .github/workflows/ci.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml index 05627684..a3df367b 100644 --- a/.github/workflows/cd-release.yml +++ b/.github/workflows/cd-release.yml @@ -33,13 +33,13 @@ jobs: fetch-depth: 0 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/ci-pr.yml b/.github/workflows/ci-pr.yml index c88a8dad..a4173c50 100644 --- a/.github/workflows/ci-pr.yml +++ b/.github/workflows/ci-pr.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v6 - name: Login to DockerHub - uses: docker/login-action@v3 + uses: docker/login-action@v4 env: DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} if: ${{ env.DOCKERHUB_USERNAME != '' }} @@ -52,7 +52,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1232357a..7ce75438 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -168,7 +168,7 @@ jobs: uses: actions/checkout@v6 - name: Login to GitHub Container Registry - uses: docker/login-action@v3 + uses: docker/login-action@v4 with: registry: ghcr.io username: ${{ github.actor }} From ec30412ecc84280c35425ee8ca319ca98efdeab9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Mar 2026 03:03:19 +0000 Subject: [PATCH 05/15] Bump docker/build-push-action from 6 to 7 Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6 to 7. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6...v7) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/cd-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml index 05627684..40921001 100644 --- a/.github/workflows/cd-release.yml +++ b/.github/workflows/cd-release.yml @@ -133,7 +133,7 @@ jobs: - name: Build and push Docker images (Docker) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: push: true context: . @@ -146,7 +146,7 @@ jobs: - name: Build and push Docker images (GHCR) if: ${{ steps.build_check.outputs.build == 'true' }} - uses: docker/build-push-action@v6 + uses: docker/build-push-action@v7 with: push: true context: . From b748c631f7398db005c2d894394402d0c46d4c73 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 21 Apr 2026 10:02:01 +0300 Subject: [PATCH 06/15] Add cooldown to dependabot configuration --- .github/dependabot.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ec5f6e0b..63770d63 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -4,6 +4,11 @@ updates: - package-ecosystem: "gomod" directory: "/" target-branch: "develop" + cooldown: + default-days: 7 + exclude: + - "github.com/essentialkaos/*" + - "golang.org/x/*" schedule: interval: "daily" timezone: "Etc/UTC" @@ -24,6 +29,8 @@ updates: - package-ecosystem: "github-actions" directory: "/" target-branch: "develop" + cooldown: + default-days: 7 schedule: interval: "daily" timezone: "Etc/UTC" From 3932103b9c4ff02f418cd89fa886e0e25011d2b2 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 21 Apr 2026 11:57:53 +0300 Subject: [PATCH 07/15] Migrate to ek.v14 --- cli/cli.go | 60 +++++++++++++++--------------- cli/cmd_add.go | 12 +++--- cli/cmd_check.go | 30 +++++++-------- cli/cmd_cleanup.go | 6 +-- cli/cmd_find.go | 6 +-- cli/cmd_gen_key.go | 16 ++++---- cli/cmd_help.go | 12 +++--- cli/cmd_info.go | 18 ++++----- cli/cmd_init.go | 8 ++-- cli/cmd_list.go | 8 ++-- cli/cmd_payload.go | 12 +++--- cli/cmd_purge_cache.go | 6 +-- cli/cmd_reindex.go | 6 +-- cli/cmd_release.go | 14 +++---- cli/cmd_remove.go | 16 ++++---- cli/cmd_resign.go | 18 ++++----- cli/cmd_sign.go | 10 ++--- cli/cmd_stats.go | 10 ++--- cli/cmd_unrelease.go | 16 ++++---- cli/cmd_which_source.go | 8 ++-- cli/common.go | 20 +++++----- cli/logger/logger.go | 6 +-- cli/logger/logger_test.go | 4 +- cli/query/query.go | 30 +++++++++------ go.mod | 8 ++-- go.sum | 12 +++--- repo/groups/writer.go | 2 +- repo/index/index.go | 4 +- repo/index/index_test.go | 2 +- repo/repository.go | 12 +++--- repo/search/search.go | 4 +- repo/sign/keygen/keygen.go | 4 +- repo/sign/keygen/keygen_test.go | 2 +- repo/sign/sign.go | 6 +-- repo/sign/sign_test.go | 4 +- repo/storage/fs/fs_storage.go | 8 ++-- repo/storage/fs/fs_storage_test.go | 2 +- repo/storage/utils/utils_test.go | 2 +- 38 files changed, 216 insertions(+), 208 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index b7f2061e..d9682046 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -12,35 +12,35 @@ import ( "os" "sync/atomic" - "github.com/essentialkaos/ek/v13/errors" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/knf" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/pager" - "github.com/essentialkaos/ek/v13/progress" - "github.com/essentialkaos/ek/v13/signal" - "github.com/essentialkaos/ek/v13/sortutil" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/support" - "github.com/essentialkaos/ek/v13/support/apps" - "github.com/essentialkaos/ek/v13/support/deps" - "github.com/essentialkaos/ek/v13/system" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" - "github.com/essentialkaos/ek/v13/terminal/tty" - "github.com/essentialkaos/ek/v13/usage" - "github.com/essentialkaos/ek/v13/usage/completion/bash" - "github.com/essentialkaos/ek/v13/usage/completion/fish" - "github.com/essentialkaos/ek/v13/usage/completion/zsh" - "github.com/essentialkaos/ek/v13/usage/man" - "github.com/essentialkaos/ek/v13/usage/update" - - knfv "github.com/essentialkaos/ek/v13/knf/validators" - knff "github.com/essentialkaos/ek/v13/knf/validators/fs" - knfr "github.com/essentialkaos/ek/v13/knf/validators/regexp" - knfs "github.com/essentialkaos/ek/v13/knf/validators/system" + "github.com/essentialkaos/ek/v14/errors" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/knf" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/pager" + "github.com/essentialkaos/ek/v14/progress" + "github.com/essentialkaos/ek/v14/signal" + "github.com/essentialkaos/ek/v14/sortutil" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/support" + "github.com/essentialkaos/ek/v14/support/apps" + "github.com/essentialkaos/ek/v14/support/deps" + "github.com/essentialkaos/ek/v14/system" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" + "github.com/essentialkaos/ek/v14/terminal/tty" + "github.com/essentialkaos/ek/v14/usage" + "github.com/essentialkaos/ek/v14/usage/completion/bash" + "github.com/essentialkaos/ek/v14/usage/completion/fish" + "github.com/essentialkaos/ek/v14/usage/completion/zsh" + "github.com/essentialkaos/ek/v14/usage/man" + "github.com/essentialkaos/ek/v14/usage/update" + + knfv "github.com/essentialkaos/ek/v14/knf/validators" + knff "github.com/essentialkaos/ek/v14/knf/validators/fs" + knfr "github.com/essentialkaos/ek/v14/knf/validators/regexp" + knfs "github.com/essentialkaos/ek/v14/knf/validators/system" "github.com/essentialkaos/rep/v3/repo/index" ) @@ -245,7 +245,7 @@ func Init(gitRev string, gomod []byte) { if !errs.IsEmpty() { terminal.Error("Options parsing errors:") - terminal.Error(errs.Error("- ")) + terminal.Error(errs.ErrorWithPrefix(" - ")) os.Exit(EC_ERROR) } diff --git a/cli/cmd_add.go b/cli/cmd_add.go index e07b570d..86db83ee 100644 --- a/cli/cmd_add.go +++ b/cli/cmd_add.go @@ -11,12 +11,12 @@ import ( "fmt" "os" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo/data" "github.com/essentialkaos/rep/v3/repo/rpm" diff --git a/cli/cmd_check.go b/cli/cmd_check.go index 25981256..8b627bb2 100644 --- a/cli/cmd_check.go +++ b/cli/cmd_check.go @@ -11,21 +11,21 @@ import ( "crypto/sha256" "fmt" - "github.com/essentialkaos/ek/v13/errors" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/hashutil" - "github.com/essentialkaos/ek/v13/mathutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/pluralize" - "github.com/essentialkaos/ek/v13/progress" - "github.com/essentialkaos/ek/v13/sortutil" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/system" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/errors" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/hashutil" + "github.com/essentialkaos/ek/v14/mathutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/pluralize" + "github.com/essentialkaos/ek/v14/progress" + "github.com/essentialkaos/ek/v14/sortutil" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/system" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/sign" diff --git a/cli/cmd_cleanup.go b/cli/cmd_cleanup.go index 9244cce7..7ba0331a 100644 --- a/cli/cmd_cleanup.go +++ b/cli/cmd_cleanup.go @@ -12,9 +12,9 @@ import ( "sort" "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo" ) diff --git a/cli/cmd_find.go b/cli/cmd_find.go index 2cb75776..a60a2307 100644 --- a/cli/cmd_find.go +++ b/cli/cmd_find.go @@ -10,9 +10,9 @@ package cli import ( "fmt" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/cli/query" "github.com/essentialkaos/rep/v3/repo" diff --git a/cli/cmd_gen_key.go b/cli/cmd_gen_key.go index e2dea70f..71296de9 100644 --- a/cli/cmd_gen_key.go +++ b/cli/cmd_gen_key.go @@ -13,14 +13,14 @@ import ( "regexp" "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/passwd" - "github.com/essentialkaos/ek/v13/secstr" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/passwd" + "github.com/essentialkaos/ek/v14/secstr" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo/sign/keygen" ) diff --git a/cli/cmd_help.go b/cli/cmd_help.go index b0e19025..5148a6d6 100644 --- a/cli/cmd_help.go +++ b/cli/cmd_help.go @@ -12,12 +12,12 @@ import ( "slices" "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/sliceutil" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/usage" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/sliceutil" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/usage" "github.com/essentialkaos/rep/v3/cli/query" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_info.go b/cli/cmd_info.go index 4beed24b..03da3da9 100644 --- a/cli/cmd_info.go +++ b/cli/cmd_info.go @@ -13,15 +13,15 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/hashutil" - "github.com/essentialkaos/ek/v13/lscolors" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/hashutil" + "github.com/essentialkaos/ek/v14/lscolors" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/timeutil" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_init.go b/cli/cmd_init.go index a1eebac6..015e7405 100644 --- a/cli/cmd_init.go +++ b/cli/cmd_init.go @@ -10,10 +10,10 @@ package cli import ( "slices" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/sliceutil" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/sliceutil" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo/data" ) diff --git a/cli/cmd_list.go b/cli/cmd_list.go index 6d14613c..8efa5c41 100644 --- a/cli/cmd_list.go +++ b/cli/cmd_list.go @@ -12,10 +12,10 @@ import ( "regexp" "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_payload.go b/cli/cmd_payload.go index df423508..0a8104ca 100644 --- a/cli/cmd_payload.go +++ b/cli/cmd_payload.go @@ -13,12 +13,12 @@ import ( "sort" "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/lscolors" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/lscolors" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_purge_cache.go b/cli/cmd_purge_cache.go index e366e1f0..7c0cdae7 100644 --- a/cli/cmd_purge_cache.go +++ b/cli/cmd_purge_cache.go @@ -8,9 +8,9 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/cli/cmd_reindex.go b/cli/cmd_reindex.go index 6479e121..1fa0c96d 100644 --- a/cli/cmd_reindex.go +++ b/cli/cmd_reindex.go @@ -8,9 +8,9 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_release.go b/cli/cmd_release.go index dac04070..770503d7 100644 --- a/cli/cmd_release.go +++ b/cli/cmd_release.go @@ -8,13 +8,13 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_remove.go b/cli/cmd_remove.go index 285be693..8d79c531 100644 --- a/cli/cmd_remove.go +++ b/cli/cmd_remove.go @@ -8,14 +8,14 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/pluralize" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/pluralize" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_resign.go b/cli/cmd_resign.go index c79bbd8d..593a4564 100644 --- a/cli/cmd_resign.go +++ b/cli/cmd_resign.go @@ -8,15 +8,15 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/fmtutil/panel" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/pluralize" - "github.com/essentialkaos/ek/v13/progress" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/fmtutil/panel" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/pluralize" + "github.com/essentialkaos/ek/v14/progress" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_sign.go b/cli/cmd_sign.go index aa853700..70f081f8 100644 --- a/cli/cmd_sign.go +++ b/cli/cmd_sign.go @@ -11,11 +11,11 @@ import ( "fmt" "os" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo/rpm" "github.com/essentialkaos/rep/v3/repo/sign" diff --git a/cli/cmd_stats.go b/cli/cmd_stats.go index c3d9bdd8..1b85a65a 100644 --- a/cli/cmd_stats.go +++ b/cli/cmd_stats.go @@ -10,11 +10,11 @@ package cli import ( "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/timeutil" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_unrelease.go b/cli/cmd_unrelease.go index 3ba4eb50..8626dd09 100644 --- a/cli/cmd_unrelease.go +++ b/cli/cmd_unrelease.go @@ -8,14 +8,14 @@ package cli // ////////////////////////////////////////////////////////////////////////////////// // import ( - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/pluralize" - "github.com/essentialkaos/ek/v13/spinner" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/pluralize" + "github.com/essentialkaos/ek/v14/spinner" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/cmd_which_source.go b/cli/cmd_which_source.go index cbfd5458..044e32fb 100644 --- a/cli/cmd_which_source.go +++ b/cli/cmd_which_source.go @@ -10,10 +10,10 @@ package cli import ( "strings" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/terminal" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/terminal" "github.com/essentialkaos/rep/v3/repo" "github.com/essentialkaos/rep/v3/repo/data" diff --git a/cli/common.go b/cli/common.go index 2d81293e..aa3c3142 100644 --- a/cli/common.go +++ b/cli/common.go @@ -13,16 +13,16 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fmtc" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/knf" - "github.com/essentialkaos/ek/v13/lock" - "github.com/essentialkaos/ek/v13/options" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/secstr" - "github.com/essentialkaos/ek/v13/terminal" - "github.com/essentialkaos/ek/v13/terminal/input" - "github.com/essentialkaos/ek/v13/tmp" + "github.com/essentialkaos/ek/v14/fmtc" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/knf" + "github.com/essentialkaos/ek/v14/lock" + "github.com/essentialkaos/ek/v14/options" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/secstr" + "github.com/essentialkaos/ek/v14/terminal" + "github.com/essentialkaos/ek/v14/terminal/input" + "github.com/essentialkaos/ek/v14/tmp" "github.com/essentialkaos/rep/v3/cli/logger" "github.com/essentialkaos/rep/v3/cli/query" diff --git a/cli/logger/logger.go b/cli/logger/logger.go index 4e17e179..0ff7865a 100644 --- a/cli/logger/logger.go +++ b/cli/logger/logger.go @@ -11,9 +11,9 @@ import ( "os" "time" - "github.com/essentialkaos/ek/v13/log" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/system" + "github.com/essentialkaos/ek/v14/log" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/system" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/cli/logger/logger_test.go b/cli/logger/logger_test.go index 74311b1b..cbaf0980 100644 --- a/cli/logger/logger_test.go +++ b/cli/logger/logger_test.go @@ -11,8 +11,8 @@ import ( "errors" "testing" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/system" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/system" . "github.com/essentialkaos/check" ) diff --git a/cli/query/query.go b/cli/query/query.go index 07d38733..93884928 100644 --- a/cli/query/query.go +++ b/cli/query/query.go @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fmtutil" - "github.com/essentialkaos/ek/v13/mathutil" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/timeutil" + "github.com/essentialkaos/ek/v14/fmtutil" + "github.com/essentialkaos/ek/v14/mathutil" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/timeutil" "github.com/essentialkaos/rep/v3/repo/data" "github.com/essentialkaos/rep/v3/repo/search" @@ -319,29 +319,37 @@ func parseBoolTermValue(value string, isNegative bool) (bool, error) { // parseSizeTermValue parses size term value func parseSizeTermValue(value string, mod uint8) (*search.Term, error) { - var from, to uint64 + var errFrom, errTo, errSize error + var from, to, size uint64 switch { case strings.HasSuffix(value, "-"): from = 0 - to = fmtutil.ParseSize(strings.TrimRight(value, "-")) + to, errTo = fmtutil.ParseSize(strings.TrimRight(value, "-")) case strings.HasSuffix(value, "+"): - from = fmtutil.ParseSize(strings.TrimRight(value, "+")) + from, errFrom = fmtutil.ParseSize(strings.TrimRight(value, "+")) to = 1024 * 1024 * 1024 case strings.Contains(value, "-"): - from = fmtutil.ParseSize(strutil.ReadField(value, 0, false, '-')) - to = fmtutil.ParseSize(strutil.ReadField(value, 1, false, '-')) + from, errFrom = fmtutil.ParseSize(strutil.ReadField(value, 0, false, '-')) + to, errTo = fmtutil.ParseSize(strutil.ReadField(value, 1, false, '-')) default: - size := fmtutil.ParseSize(value) + size, errSize = fmtutil.ParseSize(value) diff := uint64(float64(size) * 0.2) from = mathutil.Between(size-diff, 0, 1024*1024*1024) to = mathutil.Between(size+diff, 0, 1024*1024*1024) } - if from > to { + switch { + case errSize != nil: + return nil, fmt.Errorf("Invalid size value: %w", errSize) + case errFrom != nil: + return nil, fmt.Errorf("Invalid range start: %w", errFrom) + case errTo != nil: + return nil, fmt.Errorf("Invalid range end: %w", errTo) + case from > to: return nil, fmt.Errorf("Range %d→%d is invalid", from, to) } diff --git a/go.mod b/go.mod index 79c3b97a..8163b7a1 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/essentialkaos/rep/v3 -go 1.24.0 +go 1.25.0 require ( github.com/ProtonMail/go-crypto v1.0.0 github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v13 v13.38.5 + github.com/essentialkaos/ek/v14 v14.1.0 github.com/klauspost/compress v1.18.4 github.com/mattn/go-sqlite3 v1.14.34 github.com/sassoftware/go-rpmutils v0.4.0 @@ -21,6 +21,6 @@ require ( github.com/kr/text v0.2.0 // indirect github.com/rogpeppe/go-internal v1.14.1 // indirect github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect - golang.org/x/crypto v0.47.0 // indirect - golang.org/x/sys v0.40.0 // indirect + golang.org/x/crypto v0.50.0 // indirect + golang.org/x/sys v0.43.0 // indirect ) diff --git a/go.sum b/go.sum index ecaf59c5..5247e3ee 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8= github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM= -github.com/essentialkaos/ek/v13 v13.38.5 h1:OhotWDZeM5lnUcz9Ioa/Ak1J+Fm6apdSP4jipCrk1d4= -github.com/essentialkaos/ek/v13 v13.38.5/go.mod h1:qS5hOA6BaVYCS+nstm6l502Ehkb8i5PaN5nd40fbUg0= +github.com/essentialkaos/ek/v14 v14.1.0 h1:w4wstMMZDXQ0SshN41F1Dl+FzNghyhpP5XNeHFKwW20= +github.com/essentialkaos/ek/v14 v14.1.0/go.mod h1:XIsqK7Op9YPF4KucMgWVIYrelLGG7v+CrWcD957SYRs= github.com/essentialkaos/go-linenoise/v3 v3.7.0 h1:a/DzU6GFBmrKJxNAzaYbLGN6yFnIMIFaWxvSWmeCEp0= github.com/essentialkaos/go-linenoise/v3 v3.7.0/go.mod h1:IhOWE0rvvu3aPmGko/C4SoZdhbko9eTuwe5yyw7/uQ8= github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= @@ -46,8 +46,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= -golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= +golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= +golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -68,8 +68,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= -golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI= +golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= diff --git a/repo/groups/writer.go b/repo/groups/writer.go index 8272d441..f4089f03 100644 --- a/repo/groups/writer.go +++ b/repo/groups/writer.go @@ -16,7 +16,7 @@ import ( "sort" "strings" - "github.com/essentialkaos/ek/v13/sortutil" + "github.com/essentialkaos/ek/v14/sortutil" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/repo/index/index.go b/repo/index/index.go index cc1c8609..c57093ca 100644 --- a/repo/index/index.go +++ b/repo/index/index.go @@ -16,8 +16,8 @@ import ( "strconv" "strings" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/system" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/system" ) // ////////////////////////////////////////////////////////////////////////////////// // diff --git a/repo/index/index_test.go b/repo/index/index_test.go index bb86e9b1..e334c704 100644 --- a/repo/index/index_test.go +++ b/repo/index/index_test.go @@ -12,7 +12,7 @@ import ( "os" "testing" - "github.com/essentialkaos/ek/v13/fsutil" + "github.com/essentialkaos/ek/v14/fsutil" . "github.com/essentialkaos/check" ) diff --git a/repo/repository.go b/repo/repository.go index c5a3be03..7d907e58 100644 --- a/repo/repository.go +++ b/repo/repository.go @@ -15,12 +15,12 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/sliceutil" - "github.com/essentialkaos/ek/v13/sortutil" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/version" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/sliceutil" + "github.com/essentialkaos/ek/v14/sortutil" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/version" "github.com/essentialkaos/rep/v3/repo/data" "github.com/essentialkaos/rep/v3/repo/helpers" diff --git a/repo/search/search.go b/repo/search/search.go index 7e7d6557..7b72672f 100644 --- a/repo/search/search.go +++ b/repo/search/search.go @@ -12,8 +12,8 @@ import ( "sort" "strings" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/strutil" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/strutil" "github.com/essentialkaos/rep/v3/repo/data" ) diff --git a/repo/sign/keygen/keygen.go b/repo/sign/keygen/keygen.go index c769aaff..36f97779 100644 --- a/repo/sign/keygen/keygen.go +++ b/repo/sign/keygen/keygen.go @@ -11,7 +11,7 @@ import ( "bytes" "fmt" - "github.com/essentialkaos/ek/v13/secstr" + "github.com/essentialkaos/ek/v14/secstr" "github.com/ProtonMail/go-crypto/openpgp" "github.com/ProtonMail/go-crypto/openpgp/armor" @@ -71,7 +71,7 @@ func generateKey(name, email string, password *secstr.String) (*openpgp.Entity, } } - e.PrivateKey.Encrypt(password.Data) + e.PrivateKey.Encrypt(password.Bytes()) return e, nil } diff --git a/repo/sign/keygen/keygen_test.go b/repo/sign/keygen/keygen_test.go index a5b19a2c..5681421f 100644 --- a/repo/sign/keygen/keygen_test.go +++ b/repo/sign/keygen/keygen_test.go @@ -10,7 +10,7 @@ package keygen import ( "testing" - "github.com/essentialkaos/ek/v13/secstr" + "github.com/essentialkaos/ek/v14/secstr" "github.com/essentialkaos/rep/v3/repo/sign" diff --git a/repo/sign/sign.go b/repo/sign/sign.go index f10aed11..03a8e23c 100644 --- a/repo/sign/sign.go +++ b/repo/sign/sign.go @@ -12,8 +12,8 @@ import ( "fmt" "os" - "github.com/essentialkaos/ek/v13/directio" - "github.com/essentialkaos/ek/v13/secstr" + "github.com/essentialkaos/ek/v14/directio" + "github.com/essentialkaos/ek/v14/secstr" "github.com/sassoftware/go-rpmutils" @@ -175,7 +175,7 @@ func (k *ArmoredKey) Read(password *secstr.String) (*Key, error) { } if kr[0].PrivateKey.Encrypted && password != nil && !password.IsEmpty() { - err = kr[0].PrivateKey.Decrypt(password.Data) + err = kr[0].PrivateKey.Decrypt(password.Bytes()) if err != nil { return nil, err diff --git a/repo/sign/sign_test.go b/repo/sign/sign_test.go index e1cd2486..62fdd5bf 100644 --- a/repo/sign/sign_test.go +++ b/repo/sign/sign_test.go @@ -11,8 +11,8 @@ import ( "os" "testing" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/secstr" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/secstr" "github.com/ProtonMail/go-crypto/openpgp/packet" diff --git a/repo/storage/fs/fs_storage.go b/repo/storage/fs/fs_storage.go index 940c7ca6..4fc9bb0f 100644 --- a/repo/storage/fs/fs_storage.go +++ b/repo/storage/fs/fs_storage.go @@ -15,10 +15,10 @@ import ( "strings" "time" - "github.com/essentialkaos/ek/v13/fsutil" - "github.com/essentialkaos/ek/v13/path" - "github.com/essentialkaos/ek/v13/strutil" - "github.com/essentialkaos/ek/v13/system" + "github.com/essentialkaos/ek/v14/fsutil" + "github.com/essentialkaos/ek/v14/path" + "github.com/essentialkaos/ek/v14/strutil" + "github.com/essentialkaos/ek/v14/system" "github.com/essentialkaos/rep/v3/repo/data" "github.com/essentialkaos/rep/v3/repo/helpers" diff --git a/repo/storage/fs/fs_storage_test.go b/repo/storage/fs/fs_storage_test.go index c433dd68..af327f77 100644 --- a/repo/storage/fs/fs_storage_test.go +++ b/repo/storage/fs/fs_storage_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - "github.com/essentialkaos/ek/v13/fsutil" + "github.com/essentialkaos/ek/v14/fsutil" "github.com/essentialkaos/rep/v3/repo/data" "github.com/essentialkaos/rep/v3/repo/index" diff --git a/repo/storage/utils/utils_test.go b/repo/storage/utils/utils_test.go index 39721952..d644c267 100644 --- a/repo/storage/utils/utils_test.go +++ b/repo/storage/utils/utils_test.go @@ -12,7 +12,7 @@ import ( "crypto/sha256" "testing" - "github.com/essentialkaos/ek/v13/hashutil" + "github.com/essentialkaos/ek/v14/hashutil" . "github.com/essentialkaos/check" ) From 4d1560e0d93fd75260303f1c1e112d3512c853c2 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 21 Apr 2026 11:59:00 +0300 Subject: [PATCH 08/15] Bump version --- cli/cli.go | 2 +- common/rep.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cli/cli.go b/cli/cli.go index d9682046..9564dee9 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -50,7 +50,7 @@ import ( // App info const ( APP = "rep" - VER = "3.5.11" + VER = "3.6.0" DESC = "Package repository management tool" ) diff --git a/common/rep.spec b/common/rep.spec index 467078c8..73fead60 100644 --- a/common/rep.spec +++ b/common/rep.spec @@ -15,7 +15,7 @@ Summary: Package repository management tool Name: rep -Version: 3.5.11 +Version: 3.6.0 Release: 0%{?dist} Group: Applications/System License: Apache 2.0 @@ -27,7 +27,7 @@ Source100: checksum.sha512 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: golang >= 1.24 +BuildRequires: golang >= 1.25 Requires: createrepo_c @@ -109,6 +109,10 @@ rm -rf %{buildroot} ################################################################################ %changelog +* Tue Apr 21 2026 Anton Novojilov - 3.6.0-0 +- Migrated to ek.v14 +- Dependencies update + * Mon Jan 19 2026 Anton Novojilov - 3.5.11-0 - Dependencies update From 390fa3f8c7d0b0267a058805249b0671a3725ff5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Apr 2026 08:59:05 +0000 Subject: [PATCH 09/15] Bump the all group across 1 directory with 2 updates Bumps the all group with 2 updates in the / directory: [github.com/klauspost/compress](https://github.com/klauspost/compress) and [github.com/mattn/go-sqlite3](https://github.com/mattn/go-sqlite3). Updates `github.com/klauspost/compress` from 1.18.4 to 1.18.5 - [Release notes](https://github.com/klauspost/compress/releases) - [Commits](https://github.com/klauspost/compress/compare/v1.18.4...v1.18.5) Updates `github.com/mattn/go-sqlite3` from 1.14.34 to 1.14.42 - [Release notes](https://github.com/mattn/go-sqlite3/releases) - [Commits](https://github.com/mattn/go-sqlite3/compare/v1.14.34...v1.14.42) --- updated-dependencies: - dependency-name: github.com/klauspost/compress dependency-version: 1.18.5 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all - dependency-name: github.com/mattn/go-sqlite3 dependency-version: 1.14.42 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8163b7a1..4296cf71 100644 --- a/go.mod +++ b/go.mod @@ -6,8 +6,8 @@ require ( github.com/ProtonMail/go-crypto v1.0.0 github.com/essentialkaos/check v1.4.1 github.com/essentialkaos/ek/v14 v14.1.0 - github.com/klauspost/compress v1.18.4 - github.com/mattn/go-sqlite3 v1.14.34 + github.com/klauspost/compress v1.18.5 + github.com/mattn/go-sqlite3 v1.14.42 github.com/sassoftware/go-rpmutils v0.4.0 github.com/ulikunitz/xz v0.5.15 ) diff --git a/go.sum b/go.sum index 5247e3ee..cd4998c5 100644 --- a/go.sum +++ b/go.sum @@ -17,14 +17,14 @@ github.com/essentialkaos/ek/v14 v14.1.0 h1:w4wstMMZDXQ0SshN41F1Dl+FzNghyhpP5XNeH github.com/essentialkaos/ek/v14 v14.1.0/go.mod h1:XIsqK7Op9YPF4KucMgWVIYrelLGG7v+CrWcD957SYRs= github.com/essentialkaos/go-linenoise/v3 v3.7.0 h1:a/DzU6GFBmrKJxNAzaYbLGN6yFnIMIFaWxvSWmeCEp0= github.com/essentialkaos/go-linenoise/v3 v3.7.0/go.mod h1:IhOWE0rvvu3aPmGko/C4SoZdhbko9eTuwe5yyw7/uQ8= -github.com/klauspost/compress v1.18.4 h1:RPhnKRAQ4Fh8zU2FY/6ZFDwTVTxgJ/EMydqSTzE9a2c= -github.com/klauspost/compress v1.18.4/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= +github.com/klauspost/compress v1.18.5/go.mod h1:cwPg85FWrGar70rWktvGQj8/hthj3wpl0PGDogxkrSQ= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-sqlite3 v1.14.34 h1:3NtcvcUnFBPsuRcno8pUtupspG/GM+9nZ88zgJcp6Zk= -github.com/mattn/go-sqlite3 v1.14.34/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y= +github.com/mattn/go-sqlite3 v1.14.42 h1:MigqEP4ZmHw3aIdIT7T+9TLa90Z6smwcthx+Azv4Cgo= +github.com/mattn/go-sqlite3 v1.14.42/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= From a13cf3a04e8075c5c31fd9970f74c31287ef87dd Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 22 Apr 2026 11:15:46 +0300 Subject: [PATCH 10/15] Improve README --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3516173f..526e645f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@

- GoReportCard - Codacy badge - GitHub Actions CI Status - GitHub Actions CodeQL Status + GoReportCard + Codacy badge + GitHub Actions CI Status + GitHub Actions CodeQL Status

@@ -58,8 +58,8 @@ Official Docker images with `rep`: | Branch | Status | |--------|--------| -| `master` | [![CI](https://kaos.sh/w/rep/ci-push.svg?branch=master)](https://kaos.sh/w/rep/ci-push?query=branch:master) | -| `develop` | [![CI](https://kaos.sh/w/rep/ci-push.svg?branch=develop)](https://kaos.sh/w/rep/ci-push?query=branch:develop) | +| `master` | [![CI](https://github.com/essentialkaos/rep/actions/workflows/ci-push.yml/badge.svg?branch=master)](https://kaos.sh/w/rep/ci-push?query=branch:master) | +| `develop` | [![CI](https://github.com/essentialkaos/rep/actions/workflows/ci-push.yml/badge.svg?branch=develop)](https://kaos.sh/w/rep/ci-push?query=branch:develop) | ### Contributing From 9b32d452a9a7c41774005ddace352dfae800f422 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 22 Apr 2026 11:21:34 +0300 Subject: [PATCH 11/15] Dependencies update --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 4296cf71..de432c1f 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( require ( github.com/DataDog/zstd v1.5.7 // indirect - github.com/cloudflare/circl v1.6.1 // indirect + github.com/cloudflare/circl v1.6.3 // indirect github.com/essentialkaos/depsy v1.3.1 // indirect github.com/essentialkaos/go-linenoise/v3 v3.7.0 // indirect github.com/kr/pretty v0.3.1 // indirect diff --git a/go.sum b/go.sum index cd4998c5..e44833c9 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/ProtonMail/go-crypto v1.0.0 h1:LRuvITjQWX+WIfr930YHG2HNfjR1uOfyf5vE0k github.com/ProtonMail/go-crypto v1.0.0/go.mod h1:EjAoLdwvbIOoOQr3ihjnSoLZRtE8azugULFRteWMNc0= github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7NFEuV9ekS419A0= github.com/cloudflare/circl v1.3.3/go.mod h1:5XYMA4rFBvNIrhs50XuiBJ15vF2pZn4nnUKZrLbUZFA= -github.com/cloudflare/circl v1.6.1 h1:zqIqSPIndyBh1bjLVVDHMPpVKqp8Su/V+6MeDzzQBQ0= -github.com/cloudflare/circl v1.6.1/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs= +github.com/cloudflare/circl v1.6.3 h1:9GPOhQGF9MCYUeXyMYlqTR6a5gTrgR/fBLXvUgtVcg8= +github.com/cloudflare/circl v1.6.3/go.mod h1:2eXP6Qfat4O/Yhh8BznvKnJ+uzEoTQ6jVKJRn81BiS4= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 5e114dec8864266a81cfd0bff849df349a1054c6 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 22 Apr 2026 11:28:50 +0300 Subject: [PATCH 12/15] Fix tests --- repo/repository_test.go | 2 +- repo/storage/fs/fs_storage_test.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/repo/repository_test.go b/repo/repository_test.go index b9576568..9fbd1ba8 100644 --- a/repo/repository_test.go +++ b/repo/repository_test.go @@ -394,7 +394,7 @@ func (s *RepoSuite) TestSubRepositoryAddPackage(c *C) { err = r.Testing.AddPackage("test.rpm") c.Assert(err, NotNil) - c.Assert(err, ErrorMatches, `Can't add package to repository: File test.rpm doesn't exist or not accessible`) + c.Assert(err, ErrorMatches, `Can't add package to repository: file test.rpm doesn't exist or not accessible`) err = r.Testing.AddPackage("../testdata/comps.xml") c.Assert(err, NotNil) diff --git a/repo/storage/fs/fs_storage_test.go b/repo/storage/fs/fs_storage_test.go index af327f77..380e937e 100644 --- a/repo/storage/fs/fs_storage_test.go +++ b/repo/storage/fs/fs_storage_test.go @@ -108,7 +108,7 @@ func (s *StorageSuite) TestNewStorageErrors(c *C) { c.Assert(err, ErrorMatches, `Can't create storage: Path to cache directory can't be empty`) _, err = NewStorage(&Options{dopts.DataDir, "/unknown", false, "", "", 0, 0}, index.DefaultOptions) - c.Assert(err, ErrorMatches, `Can't create storage: Directory /unknown doesn't exist or not accessible`) + c.Assert(err, ErrorMatches, `Can't create storage: directory /unknown doesn't exist or not accessible`) _, err = NewStorage(dopts, nil) c.Assert(err, ErrorMatches, `Can't create storage: Index options cannot be nil`) @@ -246,20 +246,20 @@ func (s *StorageSuite) TestAddPackage(c *C) { c.Assert(fs.AddPackage("", "/path/to/file"), ErrorMatches, `Can't add package to storage: Repository name can't be empty`) c.Assert(fs.AddPackage(data.REPO_TESTING, ""), ErrorMatches, `Can't add package to storage: Path to file can't be empty`) c.Assert(fs.AddPackage("unknown", "/pkgs/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage: Repository "unknown" doesn't exist`) - c.Assert(fs.AddPackage(data.REPO_RELEASE, "/pkgs/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage: File /pkgs/test-package-1.0.0-0.el7.x86_64.rpm doesn't exist or not accessible`) + c.Assert(fs.AddPackage(data.REPO_RELEASE, "/pkgs/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage: file /pkgs/test-package-1.0.0-0.el7.x86_64.rpm doesn't exist or not accessible`) c.Assert(fs.AddPackage(data.REPO_RELEASE, tempDir+"/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add file to storage: .* is not an RPM package`) dp := fs.GetDepot(data.REPO_RELEASE, data.ARCH_X64) c.Assert(dp.AddPackage(""), ErrorMatches, `Can't add package to storage depot: Path to file can't be empty`) - c.Assert(dp.AddPackage("/pkgs/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage depot: File .*.rpm doesn't exist or not accessible`) + c.Assert(dp.AddPackage("/pkgs/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage depot: file .*.rpm doesn't exist or not accessible`) c.Assert(dp.AddPackage(tempDir+"/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add file to storage depot: .*.rpm is not an RPM package`) origDataDir := dp.dataDir dp.dataDir = "/unknown" c.Assert(dp.AddPackage("../../../testdata/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't add package to storage depot: mkdir /unknown/t: no such file or directory`) opts.SplitFiles = false - c.Assert(dp.AddPackage("../../../testdata/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't copy package to storage depot: Can't copy file: Directory "/" is not writable`) + c.Assert(dp.AddPackage("../../../testdata/test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't copy package to storage depot: can't copy file: directory "/" is not writable`) dp.dataDir = origDataDir opts.SplitFiles = true @@ -272,7 +272,7 @@ func (s *StorageSuite) TestAddPackage(c *C) { c.Assert(fs.AddPackage(data.REPO_RELEASE, "../../../testdata/git-all-2.27.0-0.el7.noarch.rpm"), IsNil) c.Assert(fsutil.IsExist(dp.dataDir+"/g/git-all-2.27.0-0.el7.noarch.rpm"), Equals, true) - c.Assert(fs.AddPackage(data.REPO_RELEASE, "unknown-package-1.0.0-0.el7.noarch.rpm"), ErrorMatches, `Can't add package to storage: File unknown-package-1.0.0-0.el7.noarch.rpm doesn't exist or not accessible`) + c.Assert(fs.AddPackage(data.REPO_RELEASE, "unknown-package-1.0.0-0.el7.noarch.rpm"), ErrorMatches, `Can't add package to storage: file unknown-package-1.0.0-0.el7.noarch.rpm doesn't exist or not accessible`) _, err = dp.makePackageDir("пакет.x86_64.rpm") c.Assert(err, ErrorMatches, `Can't create directory for package: Can't use name "п" for directory`) @@ -314,7 +314,7 @@ func (s *StorageSuite) TestRemovePackage(c *C) { dp := fs.GetDepot(data.REPO_RELEASE, data.ARCH_X64) c.Assert(dp.RemovePackage(""), ErrorMatches, `Can't remove package from storage depot: Path to file can't be empty`) - c.Assert(dp.RemovePackage("test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't remove package from storage depot: File .*.rpm doesn't exist or not accessible`) + c.Assert(dp.RemovePackage("test-package-1.0.0-0.el7.x86_64.rpm"), ErrorMatches, `Can't remove package from storage depot: file .*.rpm doesn't exist or not accessible`) fsutil.TouchFile(dp.dataDir+"/test-package-1.0.0-0.el7.x86_64.rpm", 0644) @@ -326,7 +326,7 @@ func (s *StorageSuite) TestRemovePackage(c *C) { c.Assert(fs.RemovePackage(data.REPO_RELEASE, data.ARCH_X64, "test-package-1.0.0-0.el7.noarch.rpm"), IsNil) c.Assert(fsutil.IsExist(dp.dataDir+"/test-package-1.0.0-0.el7.noarch.rpm"), Equals, false) - c.Assert(fs.RemovePackage(data.REPO_RELEASE, data.ARCH_X64, "test-package-1.0.1-0.el7.noarch.rpm"), ErrorMatches, `Can't remove package from storage depot: File .*.rpm doesn't exist or not accessible`) + c.Assert(fs.RemovePackage(data.REPO_RELEASE, data.ARCH_X64, "test-package-1.0.1-0.el7.noarch.rpm"), ErrorMatches, `Can't remove package from storage depot: file .*.rpm doesn't exist or not accessible`) opts.SplitFiles = true @@ -717,7 +717,7 @@ func (s *StorageSuite) TestStorageGetModTime(c *C) { modTime, err = fs.GetModTime(data.REPO_RELEASE, data.ARCH_X64) c.Assert(modTime.IsZero(), Equals, true) - c.Assert(err, ErrorMatches, `Can't check repository index modification date: Can't get file info for .*`) + c.Assert(err, ErrorMatches, `Can't check repository index modification date: can't get file info for .*`) } func (s *StorageSuite) TestStorageWarmupCache(c *C) { From 4882310111103257f778042fb8aa18be0180e258 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 22 Apr 2026 11:49:37 +0300 Subject: [PATCH 13/15] Update minimal required version of Go --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index de432c1f..95243ca9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/essentialkaos/rep/v3 -go 1.25.0 +go 1.25.8 require ( github.com/ProtonMail/go-crypto v1.0.0 From 194683a0262be4ec0201e1226af123552d27eedc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Apr 2026 04:01:53 +0000 Subject: [PATCH 14/15] Bump github.com/essentialkaos/ek/v14 in the all group Bumps the all group with 1 update: [github.com/essentialkaos/ek/v14](https://github.com/essentialkaos/ek). Updates `github.com/essentialkaos/ek/v14` from 14.1.0 to 14.1.1 - [Release notes](https://github.com/essentialkaos/ek/releases) - [Changelog](https://github.com/essentialkaos/ek/blob/master/CHANGELOG.md) - [Commits](https://github.com/essentialkaos/ek/compare/v14.1.0...v14.1.1) --- updated-dependencies: - dependency-name: github.com/essentialkaos/ek/v14 dependency-version: 14.1.1 dependency-type: direct:production update-type: version-update:semver-patch dependency-group: all ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 95243ca9..edf17761 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.25.8 require ( github.com/ProtonMail/go-crypto v1.0.0 github.com/essentialkaos/check v1.4.1 - github.com/essentialkaos/ek/v14 v14.1.0 + github.com/essentialkaos/ek/v14 v14.1.1 github.com/klauspost/compress v1.18.5 github.com/mattn/go-sqlite3 v1.14.42 github.com/sassoftware/go-rpmutils v0.4.0 diff --git a/go.sum b/go.sum index e44833c9..d0634f58 100644 --- a/go.sum +++ b/go.sum @@ -13,8 +13,8 @@ github.com/essentialkaos/check v1.4.1 h1:SuxXzrbokPGTPWxGRnzy0hXvtb44mtVrdNxgPa1 github.com/essentialkaos/check v1.4.1/go.mod h1:xQOYwFvnxfVZyt5Qvjoa1SxcRqu5VyP77pgALr3iu+M= github.com/essentialkaos/depsy v1.3.1 h1:00k9QcMsdPM4IzDaEFHsTHBD/zoM0oxtB5+dMUwbQa8= github.com/essentialkaos/depsy v1.3.1/go.mod h1:B5+7Jhv2a2RacOAxIKU2OeJp9QfZjwIpEEPI5X7auWM= -github.com/essentialkaos/ek/v14 v14.1.0 h1:w4wstMMZDXQ0SshN41F1Dl+FzNghyhpP5XNeHFKwW20= -github.com/essentialkaos/ek/v14 v14.1.0/go.mod h1:XIsqK7Op9YPF4KucMgWVIYrelLGG7v+CrWcD957SYRs= +github.com/essentialkaos/ek/v14 v14.1.1 h1:LHgYraLjN2LmhJ0a5l3bu/WdJHDJToUXo1lTTkvYqP0= +github.com/essentialkaos/ek/v14 v14.1.1/go.mod h1:XIsqK7Op9YPF4KucMgWVIYrelLGG7v+CrWcD957SYRs= github.com/essentialkaos/go-linenoise/v3 v3.7.0 h1:a/DzU6GFBmrKJxNAzaYbLGN6yFnIMIFaWxvSWmeCEp0= github.com/essentialkaos/go-linenoise/v3 v3.7.0/go.mod h1:IhOWE0rvvu3aPmGko/C4SoZdhbko9eTuwe5yyw7/uQ8= github.com/klauspost/compress v1.18.5 h1:/h1gH5Ce+VWNLSWqPzOVn6XBO+vJbCNGvjoaGBFW2IE= From 0db51273908352e42211e42895388d3bcc321090 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Tue, 28 Apr 2026 09:51:39 +0300 Subject: [PATCH 15/15] Update minimal required version of Go --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index edf17761..1814163d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/essentialkaos/rep/v3 -go 1.25.8 +go 1.25.9 require ( github.com/ProtonMail/go-crypto v1.0.0