ref: refs/heads/master
commit 56ec2d87e4aa6a4b2554daa54fa599cab907dde8
Author: Michael Andres
Date: Thu Feb 26 11:19:54 2009 +0100
Use correct default foe zconfig(solver.checkSystemFile) (bnc# 475144)
---
zypp.conf | 9 +++++----
zypp/ZConfig.cc | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/zypp.conf b/zypp.conf
index 8812e8f..0c4e47f 100644
--- a/zypp.conf
+++ b/zypp.conf
@@ -208,10 +208,11 @@
## installed.
## So the user will be informed if these packages will be deleted.
##
-## format: Each line represents one dependency:
-## e.g.
-## requires:kernel
-## requires:glibc
+## Format: Each line represents one dependency:
+## e.g.
+## requires:kernel
+## requires:glibc
+## Default value: {configdir}/systemCheck
##
# solver.checkSystemFile = /etc/zypp/systemCheck
diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 33b13f5..699ea99 100644
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -581,7 +581,8 @@ namespace zypp
{ return _pimpl->solver_onlyRequires; }
Pathname ZConfig::solver_checkSystemFile() const
- { return _pimpl->solver_checkSystemFile; }
+ { return ( _pimpl->solver_checkSystemFile.empty()
+ ? (configPath()/"systemCheck") : _pimpl->solver_checkSystemFile ); }
std::set<IdString> ZConfig::multiversion() const
{ return _pimpl->multiversion; }
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
