Preventing planet2 from running 'raco setup' on updating when no updates were available

This commit is contained in:
Jay McCarthy 2012-11-24 09:20:50 -07:00
parent 6c4a2067d9
commit accdcb755a
2 changed files with 10 additions and 8 deletions

View File

@ -684,13 +684,15 @@
(define to-update (filter-map update-package pkgs)) (define to-update (filter-map update-package pkgs))
(cond (cond
[(empty? to-update) [(empty? to-update)
(printf "No updates available\n")] (printf "No updates available\n")
#f]
[else [else
(install-cmd (install-cmd
#:updating? #t #:updating? #t
#:pre-succeed (λ () (for-each (compose remove-package car) to-update)) #:pre-succeed (λ () (for-each (compose remove-package car) to-update))
#:dep-behavior dep-behavior #:dep-behavior dep-behavior
(map cdr to-update))])) (map cdr to-update))
#t]))
(define (show-cmd) (define (show-cmd)
(let () (let ()
@ -805,7 +807,7 @@
(#:dep-behavior dep-behavior/c (#:dep-behavior dep-behavior/c
#:all? boolean? #:all? boolean?
#:deps? boolean?) #:deps? boolean?)
void)] boolean?)]
[remove-packages [remove-packages
(->* ((listof string?)) (->* ((listof string?))
(#:auto? boolean? (#:auto? boolean?

View File

@ -50,11 +50,11 @@
#:args pkgs #:args pkgs
(parameterize ([current-install-system-wide? installation]) (parameterize ([current-install-system-wide? installation])
(with-package-lock (with-package-lock
(update-packages pkgs (when (update-packages pkgs
#:all? all #:all? all
#:dep-behavior deps #:dep-behavior deps
#:deps? update-deps) #:deps? update-deps)
(setup dont-setup)))] (setup dont-setup))))]
[remove [remove
"Remove packages" "Remove packages"
[#:bool dont-setup () "Don't run 'raco setup' after changing packages (generally not a good idea)"] [#:bool dont-setup () "Don't run 'raco setup' after changing packages (generally not a good idea)"]