Compare commits

..

5 commits

Author SHA1 Message Date
Max
1c58f26fb1 cluster/services/gitlab: drop 2024-11-16 16:31:27 +02:00
Max
f2ad4403fa flake.lock: Update
Flake lock file updates:

• Updated input 'nix-super':
    'gitlab:max/nix-super/5ecd820c18b1aaa3c8ee257a7a9a2624c4107031?narHash=sha256-JctHGT1oa4pet4PgUKRM7pf0w%2BqGe0a/ahVij8bee3o%3D' (2024-04-22)
  → '1eb19dd804.tar.gz?narHash=sha256-HSNUAfhtG/A2hnrzPMT3asZZ2Wb3dAmedOr1VzptOCg%3D' (2024-11-10)
• Updated input 'nix-super/flake-compat':
    'github:edolstra/flake-compat/35bb57c0c8d8b62bbfd284272c928ceb64ddbde9?narHash=sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm%2B504Ch3sNKLd8%3D' (2023-01-17)
  → 'github:edolstra/flake-compat/0f9255e01c2351cc7d116c072cb317785dd33b33?narHash=sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U%3D' (2023-10-04)
• Updated input 'nix-super/flake-parts':
    'github:hercules-ci/flake-parts/9126214d0a59633752a136528f5f3b9aa8565b7d?narHash=sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm%2BGpZNw%3D' (2024-04-01)
  → 'github:hercules-ci/flake-parts/9227223f6d922fee3c7b190b2cc238a99527bbb7?narHash=sha256-pQMhCCHyQGRzdfAkdJ4cIWiw%2BJNuWsTX7f0ZYSyz0VY%3D' (2024-07-03)
• Added input 'nix-super/git-hooks-nix':
    'github:cachix/git-hooks.nix/f451c19376071a90d8c58ab1a953c6e9840527fd?narHash=sha256-6FPUl7HVtvRHCCBQne7Ylp4p%2BdpP3P/OYuzjztZ4s70%3D' (2024-07-15)
• Added input 'nix-super/git-hooks-nix/flake-compat':
    follows 'nix-super'
• Added input 'nix-super/git-hooks-nix/gitignore':
    follows 'nix-super'
• Added input 'nix-super/git-hooks-nix/nixpkgs':
    follows 'nix-super/nixpkgs'
• Added input 'nix-super/git-hooks-nix/nixpkgs-stable':
    follows 'nix-super/nixpkgs'
• Updated input 'nix-super/libgit2':
    'github:libgit2/libgit2/45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5?narHash=sha256-oX4Z3S9WtJlwvj0uH9HlYcWv%2Bx1hqp8mhXl7HsLu2f0%3D' (2023-10-18)
  → 'github:libgit2/libgit2/36f7e21ad757a3dacc58cf7944329da6bc1d6e96?narHash=sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY%3D' (2024-05-16)
• Updated input 'nix-super/nixpkgs':
    'github:NixOS/nixpkgs/b550fe4b4776908ac2a861124307045f8e717c8e?narHash=sha256-7kkJQd4rZ%2BvFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo%3D' (2024-02-28)
  → 'github:NixOS/nixpkgs/c3d4ac725177c030b1e289015989da2ad9d56af0?narHash=sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz%2BNG82pbdg%3D' (2024-08-15)
• Added input 'nix-super/nixpkgs-23-11':
    follows 'blank'
• Removed input 'nix-super/pre-commit-hooks'
• Removed input 'nix-super/pre-commit-hooks/flake-compat'
• Removed input 'nix-super/pre-commit-hooks/flake-utils'
• Removed input 'nix-super/pre-commit-hooks/gitignore'
• Removed input 'nix-super/pre-commit-hooks/nixpkgs'
• Removed input 'nix-super/pre-commit-hooks/nixpkgs-stable'
2024-11-16 16:31:27 +02:00
Max
a02a9710e4 meta: new url for nix-super 2024-11-16 16:31:27 +02:00
13cd0f6403 Merge pull request 's3ql fixes for 5.2.2' (#118) from pr-s3ql-5.2.2-fix into master
Reviewed-on: #118
2024-11-16 16:07:22 +02:00
Max
13c289556b packages/s3ql: fix metadata upload, again 2024-11-15 20:04:57 +02:00
2 changed files with 14 additions and 2 deletions

View file

@ -50,9 +50,8 @@ super: rec {
prometheus-jitsi-exporter = patch super.prometheus-jitsi-exporter "patches/base/prometheus-jitsi-exporter";
s3ql = super.s3ql.overrideAttrs (old: {
s3ql = (patch super.s3ql "patches/base/s3ql").overrideAttrs (old: {
propagatedBuildInputs = old.propagatedBuildInputs ++ [
super.python3Packages.packaging
super.python3Packages.systemd
];
});

View file

@ -0,0 +1,13 @@
diff --git a/src/s3ql/database.py b/src/s3ql/database.py
index 1c6df119..f3a47781 100644
--- a/src/s3ql/database.py
+++ b/src/s3ql/database.py
@@ -677,7 +677,7 @@ def upload_metadata(
)
obj = METADATA_OBJ_NAME % (blockno, params.seq_no)
fh.seek(blockno * blocksize)
- backend.write_fh(obj, fh, len_=blocksize)
+ backend.write_fh(obj, fh, len_=min(blocksize, db_size - blockno * blocksize))
if not update_params:
return