mirror of
https://github.com/trapexit/mergerfs.git
synced 2026-10-20 00:17:43 +00:00
Compare commits
2
Commits
master
...
nobranches
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac5652e30c | ||
|
|
2469c373be |
+12
-1
@@ -194,8 +194,19 @@ namespace l
|
|||||||
paths.push_back(glob);
|
paths.push_back(glob);
|
||||||
|
|
||||||
fs::realpathize(&paths);
|
fs::realpathize(&paths);
|
||||||
for(auto &path : paths)
|
for(const auto &path : paths)
|
||||||
{
|
{
|
||||||
|
bool is_dir;
|
||||||
|
std::error_code ec;
|
||||||
|
|
||||||
|
is_dir = ghc::filesystem::is_directory(path,ec);
|
||||||
|
if(!ec && !is_dir)
|
||||||
|
{
|
||||||
|
syslog_notice("branch path '%s' is not a directory, ignoring",
|
||||||
|
path.c_str());
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
branch.path = path;
|
branch.path = path;
|
||||||
branches_->push_back(branch);
|
branches_->push_back(branch);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -76,6 +76,8 @@ public:
|
|||||||
operator CPtr() const { std::lock_guard<std::mutex> lg(_mutex); return _impl; }
|
operator CPtr() const { std::lock_guard<std::mutex> lg(_mutex); return _impl; }
|
||||||
CPtr operator->() const { std::lock_guard<std::mutex> lg(_mutex); return _impl; }
|
CPtr operator->() const { std::lock_guard<std::mutex> lg(_mutex); return _impl; }
|
||||||
|
|
||||||
|
Ptr operator->() { std::lock_guard<std::mutex> lg(_mutex); return _impl; }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void find_and_set_mode_ro();
|
void find_and_set_mode_ro();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user