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/scripts/gc.scm | |
| parent | 9aafbc0c1382ab78059804eb16b0900fd3b10ee4 (diff) | |
| download | guix-patches-cdb5b075d545dd4e0b2a03bdc62fa0d1f6e00fc3.tar guix-patches-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/scripts/gc.scm')
| -rw-r--r-- | guix/scripts/gc.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm index 4bae65a1ec..a250cdc197 100644 --- a/guix/scripts/gc.scm +++ b/guix/scripts/gc.scm @@ -168,7 +168,7 @@ Invoke the garbage collector.\n")) (collect-garbage store min-freed) (collect-garbage store)))) ((delete) - (delete-paths store paths)) + (delete-paths store (map direct-store-path paths))) ((list-references) (list-relatives references)) ((list-requisites) |