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

raco pkg remove: fix dependency check in --auto mode

Browse Source
This commit is contained in:
Matthew Flatt 2013-11-19 16:23:27 -07:00
parent 17275e3f37
commit 30af4dfb33
6 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/racket-pkgs/racket-test/tests/pkg/test-pkgs/pkg-cycle1/info.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang info
(define deps '("test-pkgs/pkg-cycle2"))

3
pkgs/racket-pkgs/racket-test/tests/pkg/test-pkgs/pkg-cycle1/main.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang racket/base
'cycle-1

3
pkgs/racket-pkgs/racket-test/tests/pkg/test-pkgs/pkg-cycle2/info.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang info
(define deps '("test-pkgs/pkg-cycle1"))

3
pkgs/racket-pkgs/racket-test/tests/pkg/test-pkgs/pkg-cycle2/main.rkt Normal file
View File

@ -0,0 +1,3 @@
#lang racket/base
'cycle-2

20
pkgs/racket-pkgs/racket-test/tests/pkg/tests-remove.rkt
View File

@ -61,7 +61,7 @@
$ "raco pkg remove pkg-test1 pkg-test2" $ "raco pkg remove pkg-test1 pkg-test2"
$ "racket -e '(require pkg-test1)'" =exit> 1 $ "racket -e '(require pkg-test1)'" =exit> 1
$ "racket -e '(require pkg-test2)'" =exit> 1)) $ "racket -e '(require pkg-test2)'" =exit> 1))
(with-fake-root (with-fake-root
(shelly-case (shelly-case
"autoremove" "autoremove"
$ "raco pkg config --set catalogs http://localhost:9990" $ "raco pkg config --set catalogs http://localhost:9990"
@ -78,7 +78,23 @@
$ "raco pkg remove --auto" $ "raco pkg remove --auto"
$ "raco pkg show -u -a" =stdout> " [none]\n" $ "raco pkg show -u -a" =stdout> " [none]\n"
$ "racket -e '(require pkg-test1)'" =exit> 1 $ "racket -e '(require pkg-test1)'" =exit> 1
$ "racket -e '(require pkg-test2)'" =exit> 1)) $ "racket -e '(require pkg-test2)'" =exit> 1)
(shelly-case
"single-step autoremove"
$ "raco pkg install --deps search-auto test-pkgs/pkg-test2.zip" =exit> 0
$ "raco pkg remove --auto pkg-test2"
$ "raco pkg show -u -a" =stdout> " [none]\n"
$ "racket -e '(require pkg-test1)'" =exit> 1
$ "racket -e '(require pkg-test2)'" =exit> 1)
(shelly-case
"single-step autoremove with cycles"
$ "raco pkg install --deps search-auto --copy test-pkgs/pkg-cycle1" =exit> 0
$ "racket -e '(require pkg-cycle1)'" =exit> 0
$ "racket -e '(require pkg-cycle2)'" =exit> 0
$ "raco pkg remove --auto pkg-cycle1"
$ "raco pkg show -u -a" =stdout> " [none]\n"
$ "racket -e '(require pkg-cycle1)'" =exit> 1
$ "racket -e '(require pkg-cycle2)'" =exit> 1))
(with-fake-root (with-fake-root
(shelly-case (shelly-case
"different scope error" "different scope error"

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

@ -850,7 +850,9 @@
(define pkgs-set (list->set in-pkgs)) (define pkgs-set (list->set in-pkgs))
(define remaining-pkg-db-set (define remaining-pkg-db-set
(set-subtract all-pkgs-set (set-subtract all-pkgs-set
pkgs-set)) (if auto?
(list->set remove-pkgs)
pkgs-set)))
(define deps-to-be-removed (define deps-to-be-removed
(set-intersect (set-intersect
pkgs-set pkgs-set