projects
/
platform
/
upstream
/
libzypp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 14.45.0
[platform/upstream/libzypp.git]
/
zypp
/
solver
/
detail
/
SystemCheck.h
diff --git
a/zypp/solver/detail/SystemCheck.h
b/zypp/solver/detail/SystemCheck.h
index
ea41e4a
..
92a8659
100644
(file)
--- a/
zypp/solver/detail/SystemCheck.h
+++ b/
zypp/solver/detail/SystemCheck.h
@@
-11,9
+11,6
@@
*/
#ifndef ZYPP_TARGET_SYSTEMCHECK_H
#define ZYPP_TARGET_SYSTEMCHECK_H
*/
#ifndef ZYPP_TARGET_SYSTEMCHECK_H
#define ZYPP_TARGET_SYSTEMCHECK_H
-#ifndef ZYPP_USE_RESOLVER_INTERNALS
-#error Do not directly include this file!
-#else
#include <iosfwd>
#include <iosfwd>
@@
-41,20
+38,11
@@
namespace zypp
/** Return the file path. */
const Pathname & file();
/** Return the file path. */
const Pathname & file();
- /** Return the directory path. */
- const Pathname & dir();
-
/** Set configuration file of system requirements
* Should be used for testcase only
*/
bool setFile(const Pathname & file) const;
/** Set configuration file of system requirements
* Should be used for testcase only
*/
bool setFile(const Pathname & file) const;
- /** Set configuration directory for files of system
- * requirements.
- * Should be used for testcase only
- */
- bool setDir(const Pathname & dir) const;
-
/** Returns a list of required system capabilities.
*/
const CapabilitySet & requiredSystemCap() const;
/** Returns a list of required system capabilities.
*/
const CapabilitySet & requiredSystemCap() const;
@@
-66,8
+54,8
@@
namespace zypp
private:
/** Ctor taking the file to read. */
SystemCheck();
private:
/** Ctor taking the file to read. */
SystemCheck();
-
bool loadFile(Pathname &file, bool reset_caps = true
) const;
- bool loadFiles() const;
+
bool loadFile(
) const;
+
};
///////////////////////////////////////////////////////////////////
};
///////////////////////////////////////////////////////////////////
@@
-77,5
+65,4
@@
namespace zypp
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
} // namespace zypp
///////////////////////////////////////////////////////////////////
-#endif // ZYPP_USE_RESOLVER_INTERNALS
#endif // ZYPP_TARGET_SYSTEMCHECK_H
#endif // ZYPP_TARGET_SYSTEMCHECK_H