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

raco catalog-archive: fix dependencies and tags in new catalog

Browse Source
This commit is contained in:
Matthew Flatt 2014-07-02 05:55:55 +01:00
parent a94a633f36
commit 183ad7e3e4
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/racket-pkgs/racket-test/tests/pkg/tests-catalogs.rkt
View File

@ -133,6 +133,10 @@
=exit> 1
$ (~a "test -f " archive-d "/pkgs/pkg-test2.zip")
$ (~a "test -f " archive-d "/pkgs/pkg-test2-snd.zip") =exit> 1
$ (~a "raco pkg catalog-show --catalog file://" archive-d "/catalog pkg-test2")
=stdout> #px"Dependencies:\\s+ pkg-test1"
$ (~a "raco pkg catalog-show --catalog file://" archive-d "/catalog pkg-test1")
=stdout> #px"Tags: first"
;; Incremental update:
$ (~a "raco pkg catalog-archive --from-config --relative"

12
pkgs/racket-pkgs/racket-test/tests/pkg/util.rkt
View File

@ -190,18 +190,24 @@
(hasheq 'checksum
(file->string "test-pkgs/pkg-test1.zip.CHECKSUM")
'source
"http://localhost:9999/pkg-test1.zip"))
"http://localhost:9999/pkg-test1.zip"
'tags
'("first")))
(hash-set! *index-ht-1* "pkg-test2"
(hasheq 'checksum
(file->string "test-pkgs/pkg-test2.zip.CHECKSUM")
'source
"http://localhost:9999/pkg-test2.zip"))
"http://localhost:9999/pkg-test2.zip"
'dependencies
'("pkg-test1")))
(hash-set! *index-ht-2* "pkg-test2-snd"
(hasheq 'checksum
(file->string "test-pkgs/pkg-test2.zip.CHECKSUM")
'source
"http://localhost:9999/pkg-test2.zip")))
"http://localhost:9999/pkg-test2.zip"
'dependencies
'("pkg-test1"))))
(provide (all-defined-out))

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

@ -3322,8 +3322,8 @@
(define new-checksum
(file->string (path-replace-suffix pkg-file #".zip.CHECKSUM")))
(parameterize ([db:current-pkg-catalog-file temp-catalog-file])
(define modules (db:get-pkg-modules name (db:pkg-catalog pkg) (or current-checksum "")))
(define dependencies (db:get-pkg-dependencies name (db:pkg-catalog pkg) (or current-checksum "")))
(define modules (db:get-pkg-modules name (db:pkg-catalog pkg) (db:pkg-checksum pkg)))
(define dependencies (db:get-pkg-dependencies name (db:pkg-catalog pkg) (db:pkg-checksum pkg)))
(db:set-pkg! name (db:pkg-catalog pkg)
(db:pkg-author pkg)
(path->string (path->complete-path pkg-file))