diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21 15:30:01 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21 15:30:01 +0100 |
| commit | 81628a6ccc6ce496735b22492bee15c9ad46f072 (patch) | |
| tree | d1ec18b84514d2f44700082f8d800efb929a7678 /src/libstore/gc.cc | |
| parent | b1db599dd05e86f65e73dc40584913e6e78c2bac (diff) | |
| parent | 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8 (diff) | |
Merge branch 'master' into make
Conflicts:
src/libexpr/eval.cc
Diffstat (limited to 'src/libstore/gc.cc')
| -rw-r--r-- | src/libstore/gc.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index ce9b10f05..d212259f3 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -734,6 +734,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results) /* Allow other processes to add to the store from here on. */ fdGCLock.close(); + fds.clear(); /* Delete the trash directory. */ printMsg(lvlInfo, format("deleting `%1%'") % state.trashDir); |