Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #2 from mer-packages/systemcheck-fix
[zypp] Only read *.check files from the systemCheck.d directory
  • Loading branch information
iamer committed Dec 30, 2013
2 parents 526f802 + df5ed05 commit ac1c1e0
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions libzypp/zypp/solver/detail/SystemCheck.cc
Expand Up @@ -131,9 +131,16 @@ namespace zypp
filesystem::dirForEach(_dir,
[this](const Pathname & dir_r, const char *const & name_r)->bool
{
const std::string wanted = ".check";
Pathname pth = dir_r/name_r;
MIL << "Reading " << pth << endl;
return loadFile(pth, false /* do not reset caps */);
if (pth.extension() != wanted) {
MIL << "Skipping " << pth << " (not a *.check file)" << endl;
return true;
}
else {
MIL << "Reading " << pth << endl;
return loadFile(pth, false /* do not reset caps */);
}
});
return true;
}
Expand Down

0 comments on commit ac1c1e0

Please sign in to comment.