From 313109e050044c000476d9e752334d0a8fd7d7d5 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Mon, 6 May 2013 22:31:22 +0200
Subject: refresh: Change default to not update source files.

* guix/scripts/refresh.scm (%options): Change `--dry-run' to `--update'.
  (show-help): Adjust accordingly.
  (guix-refresh): Likewise.
---
 guix/scripts/refresh.scm | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm
index 6584282f93..69e5114e00 100644
--- a/guix/scripts/refresh.scm
+++ b/guix/scripts/refresh.scm
@@ -44,9 +44,9 @@ (define %default-options
 
 (define %options
   ;; Specification of the command-line options.
-  (list (option '(#\n "dry-run") #f #f
+  (list (option '(#\u "update") #f #f
                 (lambda (opt name arg result)
-                  (alist-cons 'dry-run? #t result)))
+                  (alist-cons 'update? #t result)))
         (option '(#\s "select") #t #f
                 (lambda (opt name arg result)
                   (match arg
@@ -73,7 +73,7 @@ (define (show-help)
 update all the packages of the distribution, or the subset thereof
 specified with `--select'.\n"))
   (display (_ "
-  -n, --dry-run          do not build the derivations"))
+  -u, --update           update source files in place"))
   (display (_ "
   -s, --select=SUBSET    select all the packages in SUBSET, one of
                          `core' or `non-core'"))
@@ -121,7 +121,7 @@ (define core-package?
         (member (package-name package) names))))
 
   (let* ((opts     (parse-options))
-         (dry-run? (assoc-ref opts 'dry-run?))
+         (update?  (assoc-ref opts 'update?))
          (packages (match (concatenate
                            (filter-map (match-lambda
                                         (('argument . value)
@@ -146,19 +146,7 @@ (define core-package?
                      (some                        ; user-specified packages
                       some))))
     (with-error-handling
-      (if dry-run?
-          (for-each (lambda (package)
-                      (match (false-if-exception (package-update-path package))
-                        ((new-version . directory)
-                         (let ((loc (or (package-field-location package 'version)
-                                        (package-location package))))
-                           (format (current-error-port)
-                                   (_ "~a: ~a would be upgraded from ~a to ~a~%")
-                                   (location->string loc)
-                                   (package-name package) (package-version package)
-                                   new-version)))
-                        (_ #f)))
-                    packages)
+      (if update?
           (let ((store (open-connection)))
             (for-each (lambda (package)
                         (let-values (((version tarball)
@@ -179,4 +167,16 @@ (define core-package?
                             (let ((hash (call-with-input-file tarball
                                           (compose sha256 get-bytevector-all))))
                               (update-package-source package version hash)))))
-                      packages))))))
+                      packages))
+          (for-each (lambda (package)
+                      (match (false-if-exception (package-update-path package))
+                        ((new-version . directory)
+                         (let ((loc (or (package-field-location package 'version)
+                                        (package-location package))))
+                           (format (current-error-port)
+                                   (_ "~a: ~a would be upgraded from ~a to ~a~%")
+                                   (location->string loc)
+                                   (package-name package) (package-version package)
+                                   new-version)))
+                        (_ #f)))
+                    packages)))))
-- 
cgit v1.2.3