ref: refs/heads/SuSE-Code-11-Branch
commit 8f203b50849d17e872d8edfecff6aad6e7e991f4
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 0e089e0..372955c 100644
--- a/zypp.conf
+++ b/zypp.conf
@@ -183,10 +183,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 816b5fc..22d0bc5 100644
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -544,7 +544,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
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
