Skip to content

Commit 33a856f

Browse files
committed
Review comments
1 parent 3771d17 commit 33a856f

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/libstore/local-store-active-builds.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ static std::set<pid_t> getDescendantPids(pid_t pid)
8484
self(*childPid);
8585
} catch (...) {
8686
// Process may have exited.
87+
ignoreExceptionExceptInterrupt();
8788
}
8889
}(pid);
8990

@@ -242,7 +243,7 @@ std::vector<ActiveBuildInfo> LocalStore::queryActiveBuilds()
242243
#endif
243244

244245
result.push_back(std::move(info));
245-
} catch (Error &) {
246+
} catch (...) {
246247
ignoreExceptionExceptInterrupt();
247248
}
248249
}

src/libutil/table.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ void printTable(std::ostream & out, Table & table, unsigned int width)
1919
assert(i.size() == nrColumns);
2020
size_t column = 0;
2121
for (auto j = i.begin(); j != i.end(); ++j, ++column)
22+
// TODO: take ANSI escapes into account when calculating width.
2223
widths[column] = std::max(widths[column], j->content.size());
2324
}
2425

0 commit comments

Comments
 (0)