From 74e667d14912b9243043b43995848d962569a9a1 Mon Sep 17 00:00:00 2001
From: Mathieu Lirzin <mthl@gnu.org>
Date: Sun, 24 Jan 2016 17:42:39 +0100
Subject: [PATCH] packages: Use '@' in package record printers.
* guix/packages.scm <package>: Use '@' in record printer.
* guix/import/cabal.scm <cabal-package>: Likewise
* guix/import/elpa.scm <elpa-package>: Likewise.
* tests/packages.scm: Adapt to it.
---
guix/import/cabal.scm | 2 +-
guix/import/elpa.scm | 2 +-
guix/packages.scm | 2 +-
tests/packages.scm | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/guix/import/cabal.scm b/guix/import/cabal.scm
index c20e074e180..09130e44981 100644
--- a/guix/import/cabal.scm
+++ b/guix/import/cabal.scm
@@ -608,7 +608,7 @@ (define-record-type <cabal-package>
(set-record-type-printer! <cabal-package>
(lambda (package port)
- (format port "#<cabal-package ~a-~a>"
+ (format port "#<cabal-package ~a@~a>"
(cabal-package-name package)
(cabal-package-version package))))
diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 8c10668293a..529de4f232f 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -121,7 +121,7 @@ (define-record-type <elpa-package>
(set-record-type-printer! <elpa-package>
(lambda (package port)
- (format port "#<elpa-package ~a-~a>"
+ (format port "#<elpa-package ~a@~a>"
(elpa-package-name package)
(elpa-package-version package))))
diff --git a/guix/packages.scm b/guix/packages.scm
index 41f3e20c41b..6ec168c2040 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -278,7 +278,7 @@ (define-record-type* <package>
(lambda (package port)
(let ((loc (package-location package))
(format simple-format))
- (format port "#<package ~a-~a ~a~a>"
+ (format port "#<package ~a@~a ~a~a>"
(package-name package)
(package-version package)
(if loc
diff --git a/tests/packages.scm b/tests/packages.scm
index 6a2f4f06e1e..9d37fb68d67 100644
--- a/tests/packages.scm
+++ b/tests/packages.scm
@@ -58,7 +58,7 @@ (define %store
(test-begin "packages")
(test-assert "printer with location"
- (string-match "^#<package foo-0 foo.scm:42 [[:xdigit:]]+>$"
+ (string-match "^#<package foo@0 foo.scm:42 [[:xdigit:]]+>$"
(with-output-to-string
(lambda ()
(write
@@ -66,7 +66,7 @@ (define %store
(location (make-location "foo.scm" 42 7))))))))
(test-assert "printer without location"
- (string-match "^#<package foo-0 [[:xdigit:]]+>$"
+ (string-match "^#<package foo@0 [[:xdigit:]]+>$"
(with-output-to-string
(lambda ()
(write
--
GitLab