diff options
| author | Cyrill Schenkel <cyrill.schenkel@gmail.com> | 2015-05-24 14:04:15 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2015-05-26 22:26:01 +0200 |
| commit | cdb5b075d545dd4e0b2a03bdc62fa0d1f6e00fc3 (patch) | |
| tree | 45acbdd1be71153881dc51c76e9ae6006547e026 /guix/store.scm | |
| parent | 9aafbc0c1382ab78059804eb16b0900fd3b10ee4 (diff) | |
| download | gnu-guix-cdb5b075d545dd4e0b2a03bdc62fa0d1f6e00fc3.tar gnu-guix-cdb5b075d545dd4e0b2a03bdc62fa0d1f6e00fc3.tar.gz | |
gc: ignore trailing slash or subdirectories for `guix gc -d'
Fixes <http://bugs.gnu.org/19757>.
* guix/scripts/gc.scm (guix-gc): Convert paths to direct store paths.
* guix/store.scm (direct-store-path): Get rid of subdirectories in store path.
* tests/guix-gc.sh: New tests.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'guix/store.scm')
| -rw-r--r-- | guix/store.scm | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/guix/store.scm b/guix/store.scm index fc2f8d92ca..8905a5a558 100644 --- a/guix/store.scm +++ b/guix/store.scm @@ -121,6 +121,7 @@ derivation-path? store-path-package-name store-path-hash-part + direct-store-path log-file)) (define %protocol-version #x10c) @@ -1012,6 +1013,15 @@ valid inputs." (let ((len (+ 1 (string-length (%store-prefix))))) (not (string-index (substring path len) #\/))))) +(define (direct-store-path path) + "Return the direct store path part of PATH, stripping components after +'/gnu/store/xxxx-foo'." + (let ((prefix-length (+ (string-length (%store-prefix)) 35))) + (if (> (string-length path) prefix-length) + (let ((slash (string-index path #\/ prefix-length))) + (if slash (string-take path slash) path)) + path))) + (define (derivation-path? path) "Return #t if PATH is a derivation path." (and (store-path? path) (string-suffix? ".drv" path))) |