suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

raco pkg update: change printout to avoid alarming "Removing..."

Browse Source 
Changed "Removing" to "Uninstalling to prepare re-install of".
This commit is contained in:
Matthew Flatt 2014-12-14 06:27:28 -07:00
parent 1ef244f4b7
commit 58bee1419b
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
racket/collects/pkg/private/install.rkt
View File

@ -425,7 +425,7 @@
(let ()
(define (continue conversation)
(raise (vector #t infos pkg-name update-pkgs
(λ () (for-each (compose (remove-package quiet? use-trash?) pkg-desc-name) update-pkgs))
(λ () (for-each (compose (remove-package #t quiet? use-trash?) pkg-desc-name) update-pkgs))
conversation
clone-info)))
(match (if (andmap (lambda (dep) (set-member? implies (pkg-desc-name dep)))
@ -527,7 +527,7 @@
#:from-command-line? from-command-line?
#:link-dirs? link-dirs?)
update-pkgs)])
(λ () (for-each (compose (remove-package quiet? use-trash?) pkg-desc-name) to-update))))
(λ () (for-each (compose (remove-package #t quiet? use-trash?) pkg-desc-name) to-update))))
(match this-dep-behavior
['fail
(clean!)
@ -863,7 +863,7 @@
#:catalog-lookup-cache catalog-lookup-cache
#:pre-succeed (λ ()
(for ([pkg-name (in-hash-keys extra-updating)])
((remove-package quiet? use-trash?) pkg-name))
((remove-package #t quiet? use-trash?) pkg-name))
(pre-succeed))
#:updating? updating?
#:extra-updating extra-updating
@ -1169,7 +1169,7 @@
(flush-output))
(pkg-install
#:updating? #t
#:pre-succeed (λ () (for-each (compose (remove-package quiet? use-trash?) pkg-desc-name) to-update))
#:pre-succeed (λ () (for-each (compose (remove-package #t quiet? use-trash?) pkg-desc-name) to-update))
#:dep-behavior dep-behavior
#:update-deps? update-deps?
#:update-implies? update-implies?

10
racket/collects/pkg/private/remove.rkt
View File

@ -25,9 +25,13 @@
(printf/flush "Demoting ~a to auto-installed\n" pkg-name))
(update-pkg-db! pkg-name (update-auto pi #t)))))
(define ((remove-package quiet? use-trash?) pkg-name)
(define ((remove-package for-install? quiet? use-trash?) pkg-name)
(unless quiet?
(printf/flush "Removing ~a\n" pkg-name))
(printf/flush "~a ~a\n"
(if for-install?
"Uninstalling to prepare re-install of"
"Removing")
pkg-name))
(define db (read-pkg-db))
(define pi (package-info pkg-name #:db db))
(match-define (pkg-info orig-pkg checksum _) pi)
@ -142,7 +146,7 @@
(set->list (set-subtract (list->set in-pkgs)
(list->set remove-pkgs)))))
(for-each (remove-package quiet? use-trash?)
(for-each (remove-package #f quiet? use-trash?)
remove-pkgs)
(cond