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

raco pkg update: don't claim conflict with package being updated

Browse Source 
Merge to v6.1
This commit is contained in:
Matthew Flatt 2014-07-28 16:28:44 +01:00
parent b5e7fa3434
commit d2a8bfcfe6
2 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/racket-pkgs/racket-test/tests/pkg/tests-conflicts.rkt
View File

@ -113,6 +113,17 @@
(shelly-case (shelly-case
"no conflict for non-matching platform" "no conflict for non-matching platform"
$ "raco pkg install --copy --strict-doc-conflicts test-pkgs/pkg-add-base test-pkgs/pkg-add-none")) $ "raco pkg install --copy --strict-doc-conflicts test-pkgs/pkg-add-base test-pkgs/pkg-add-none"))
(shelly-case
"no doc conflict for an update"
(for ([c '("test-pkgs/pkg-add-base"
"test-pkgs/pkg-add-a"
"test-pkgs/pkg-add-x"
"test-pkgs/pkg-add-1")])
(with-fake-root
(shelly-begin
$ "raco pkg install --copy test-pkgs/pkg-add-base"
$ "raco setup -D --pkgs pkg-add-base"
$ (~a "raco pkg update --copy --name pkg-add-base " c) =exit> 0))))
(shelly-case (shelly-case
"compile-omit-paths is used by `pkg-directory->additional-installs`:" "compile-omit-paths is used by `pkg-directory->additional-installs`:"

22
racket/collects/pkg/lib.rkt
View File

@ -1674,7 +1674,12 @@
(eq? (car ai) 'doc) (eq? (car ai) 'doc)
(eq? (current-pkg-scope) 'user)) (eq? (current-pkg-scope) 'user))
#f] #f]
[(set-member? (get-additional-installed (car ai) ai-cache metadata-ns) ai) [(set-member? (get-additional-installed (car ai)
simultaneous-installs
ai-cache
metadata-ns
path-pkg-cache)
ai)
;; This item is already installed ;; This item is already installed
(cons #f ai)] (cons #f ai)]
[else [else
@ -3388,9 +3393,10 @@
(extract-man-pages i)) (extract-man-pages i))
(set)))) (set))))
(define (get-additional-installed kind ai-cache metadata-ns) (define (get-additional-installed kind skip-ht-keys ai-cache metadata-ns path-pkg-cache)
(or (unbox ai-cache) (or (unbox ai-cache)
(let () (let ()
(define skip-pkgs (list->set (hash-keys skip-ht-keys)))
(define dirs (find-relevant-directories '(scribblings (define dirs (find-relevant-directories '(scribblings
racket-launcher-names racket-launcher-names
mzscheme-launcher-names mzscheme-launcher-names
@ -3406,10 +3412,14 @@
'all-available 'all-available
'no-user))) 'no-user)))
(define s (for/fold ([s (set)]) ([dir (in-list dirs)]) (define s (for/fold ([s (set)]) ([dir (in-list dirs)])
(define i (get-pkg-info dir metadata-ns)) (cond
(if i [(set-member? skip-pkgs (path->pkg dir #:cache path-pkg-cache))
(set-union s (extract-additional-installs i #f #f)) s]
s))) [else
(define i (get-pkg-info dir metadata-ns))
(if i
(set-union s (extract-additional-installs i #f #f))
s)])))
(set-box! ai-cache s) (set-box! ai-cache s)
s))) s)))