Subject: bug#62372: closed (Re: [bug#62372] [PATCH] gnu: borgmatic: Update to 1.7.9.)

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 22 Mar 2023 16:53:02 +0000

Your bug report

#62372: [PATCH] gnu: borgmatic: Update to 1.7.9.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
62372: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=62372
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#62372] [PATCH] gnu: borgmatic: Update to 1.7.9.
From: Leo Famulari <[email-masked]>
To: Sergey Trofimov <[email-masked]>
Cc: [email-masked]
Date: Wed, 22 Mar 2023 12:52:23 -0400
List-Id: <debbugs-submit.debbugs.gnu.org>

On Wed, Mar 22, 2023 at 09:11:36AM +0100, Sergey Trofimov wrote:
> * gnu/packages/backup.scm (borgmatic): Update to 1.7.9.
> Set absolute store path to borg in commands.py.

Thanks! Pushed as afb1373fce0aa169fea6595cfba7a00d63fd4e8f

Subject: [PATCH] gnu: borgmatic: Update to 1.7.9.
From: Sergey Trofimov <[email-masked]>
To: [email-masked]
Cc: Sergey Trofimov <[email-masked]>
Date: Wed, 22 Mar 2023 09:11:36 +0100
List-Id: <debbugs-submit.debbugs.gnu.org>

* 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?
-- 
2.39.2