From 259621f7cb3a0229c05e2d28a3bf7402069e69f6 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Sat, 6 Apr 2013 14:43:16 -0600 Subject: [PATCH] Fixing PR13657 --- collects/pkg/lib.rkt | 13 ++++++++++--- collects/pkg/main.rkt | 4 ++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/collects/pkg/lib.rkt b/collects/pkg/lib.rkt index bb1ed52c77..8c42717610 100644 --- a/collects/pkg/lib.rkt +++ b/collects/pkg/lib.rkt @@ -1190,6 +1190,8 @@ (pkg-error "directory does not exist\n path: ~a" dir)) (match create:format ['MANIFEST + (printf "creating manifest for ~a\n" + dir) (with-output-to-file (build-path dir "MANIFEST") #:exists 'replace @@ -1198,8 +1200,10 @@ (find-files file-exists?)))]) (display f) (newline))))] - [else + [else (define pkg (format "~a.~a" dir create:format)) + (printf "packing ~a into ~a\n" + dir pkg) (define pkg-name (regexp-replace (regexp (format "~a$" (regexp-quote (format ".~a" create:format)))) @@ -1239,8 +1243,11 @@ [x (pkg-error "invalid package format\n format: ~a" x)]) (define chk (format "~a.CHECKSUM" pkg)) - (with-output-to-file chk #:exists 'replace - (λ () (display (call-with-input-file pkg sha1))))]))) + (printf "writing package checksum to ~a\n" + chk) + (with-output-to-file chk + #:exists 'replace + (λ () (display (call-with-input-file pkg sha1))))]))) (define dep-behavior/c (or/c false/c diff --git a/collects/pkg/main.rkt b/collects/pkg/main.rkt index ca4f646fa9..8314626d7f 100644 --- a/collects/pkg/main.rkt +++ b/collects/pkg/main.rkt @@ -222,6 +222,6 @@ ("Select the format of the package to be created;" "valid s are: zip (the default), tgz, plt")] [#:bool manifest () "Creates a manifest file for a directory, rather than an archive"] - #:args (maybe-dir) + #:args (package-directory) (parameterize ([current-pkg-error (pkg-error 'create)]) - (create-cmd (if manifest 'MANIFEST (or format 'zip)) maybe-dir))]) + (create-cmd (if manifest 'MANIFEST (or format 'zip)) package-directory))])