From patchwork Wed Mar 22 08:11:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergey Trofimov X-Patchwork-Id: 48566 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 04A2616FB5; Wed, 22 Mar 2023 08:13:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EF5F416FA9 for ; Wed, 22 Mar 2023 08:13:17 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1petZm-0003jv-1D; Wed, 22 Mar 2023 04:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1petZj-0003eh-Hz for guix-patches@gnu.org; Wed, 22 Mar 2023 04:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1petZi-0003Ce-Ua for guix-patches@gnu.org; Wed, 22 Mar 2023 04:12:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1petZi-0004qY-G1 for guix-patches@gnu.org; Wed, 22 Mar 2023 04:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62372] [PATCH] gnu: borgmatic: Update to 1.7.9. Resent-From: Sergey Trofimov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 22 Mar 2023 08:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62372 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62372@debbugs.gnu.org Cc: Sergey Trofimov X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167947269718593 (code B ref -1); Wed, 22 Mar 2023 08:12:02 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2023 08:11:37 +0000 Received: from localhost ([127.0.0.1]:33401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1petZJ-0004po-09 for submit@debbugs.gnu.org; Wed, 22 Mar 2023 04:11:37 -0400 Received: from lists.gnu.org ([209.51.188.17]:42326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1petZH-0004ph-Dv for submit@debbugs.gnu.org; Wed, 22 Mar 2023 04:11:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1petZG-0003CB-0X for guix-patches@gnu.org; Wed, 22 Mar 2023 04:11:34 -0400 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1petZD-000339-FG for guix-patches@gnu.org; Wed, 22 Mar 2023 04:11:33 -0400 Received: by mail-ed1-x52c.google.com with SMTP id i5so22464714eda.0 for ; Wed, 22 Mar 2023 01:11:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sarg.org.ru; s=google; t=1679472687; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=OBZbOrlblbiVk7t+i5UtQNEZd7G7GumldrQMH7kwAoo=; b=jN9ZFLNmIK6KihZRh/MwBhuJ7LXQ52AFeDl4Dp6jE3vs2zXvkhZTGBV6W+IQ73/Fuf y9nRuZSGPq7WPBxbLnOs5am+bI1D+B6wjodNrL7ACW4NIyk1nvZeDUhCceKyHrH/FO+H My0YtOCymvRyvbDALXbkvBwq/i7tG9wGgzoUA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679472687; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OBZbOrlblbiVk7t+i5UtQNEZd7G7GumldrQMH7kwAoo=; b=tn06wAJPzQWEOUPy1SZUYtdeE/klFg+D12VheDr2ZF37reP555BmfvmotjV/Dc8oVZ R/oJNP0TJsHd1oCGsouPYkblw/3kQM3FHk8dBBQatXC0M/5lZZSOEzzg1cdwTG6V7h7k 94tvwqAWh8WKFUf/lKCsxQaZaljYK9TV/L/C+cc6l5fHDn+jhfBhqYMWeBIBBrOFf5bZ jdvergAPU/4/jXdwMOtIq1B8/lo5wgm7/qm0tQBWr+CCrhCDwcTrLCjOkFV57DvQ/ft2 MopKBZ20apYJXEqeG2adu1E/yvDRicodINr3eAjaMDIdciWRF9RU+EkDGXPBTcqad6bO 2+YA== X-Gm-Message-State: AO0yUKV3+PqdLPsohPpjKu1d9fu3Ah16G5myA4cSkY89265hcEY9fHrn qHhuVr231sUrdGjpAZi/FhATbd4uzqBVYvzZEyrxhA== X-Google-Smtp-Source: AK7set/w2beXuRHNKg+1VAlK8O5Mxo9Xwwaq16mLSih4qOA6Heg4etBG9RbH/oM8W7TEpMOAKmVF8A== X-Received: by 2002:a17:906:6082:b0:861:7a02:1046 with SMTP id t2-20020a170906608200b008617a021046mr5441179ejj.37.1679472687525; Wed, 22 Mar 2023 01:11:27 -0700 (PDT) Received: from localhost ([95.168.147.255]) by smtp.gmail.com with ESMTPSA id gv27-20020a1709072bdb00b008b9b4ab6ad1sm6791234ejc.102.2023.03.22.01.11.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 01:11:27 -0700 (PDT) From: Sergey Trofimov Date: Wed, 22 Mar 2023 09:11:36 +0100 Message-Id: <20230322081136.1155-1-sarg@sarg.org.ru> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: none client-ip=2a00:1450:4864:20::52c; envelope-from=sarg@sarg.org.ru; helo=mail-ed1-x52c.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/backup.scm (borgmatic): Update to 1.7.9. Set absolute store path to borg in commands.py. --- gnu/packages/backup.scm | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index cf47ac9c80..97a4c36696 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1255,13 +1255,13 @@ (define-public disarchive (define-public borgmatic (package (name "borgmatic") - (version "1.5.22") + (version "1.7.9") (source (origin (method url-fetch) (uri (pypi-uri "borgmatic" version)) (sha256 - (base32 "0pvqlj17vp81i7saxqh5hsaxqz29ldrjd7bcssh4g1h0ikmnaf2r")))) + (base32 "1scfh90qgv8xhafnnpl3pa9d8m4rg9xgvf21yybvmsnm5v1k2x5z")))) (build-system python-build-system) (arguments (list #:phases @@ -1270,10 +1270,15 @@ (define-public borgmatic (lambda* (#:key inputs #:allow-other-keys) ;; Set absolute store path to borg. (substitute* "borgmatic/commands/borgmatic.py" - (("location\\.get\\('local_path', 'borg'\\)") - (string-append "location.get('local_path', '" + (("\\.get\\('local_path', 'borg'\\)") + (string-append ".get('local_path', '" (search-input-file inputs "bin/borg") - "')"))))) + "')"))) + (substitute* "tests/unit/commands/test_borgmatic.py" + (("(module.get_local_path.+ == )'borg'" all start) + (string-append start "'" + (search-input-file inputs "bin/borg") + "'"))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests?