{
#include <sys/utsname.h>
#include <unistd.h>
+#include <solv/satversion.h>
}
#include <iostream>
#include <fstream>
#include "zypp/PathInfo.h"
#include "zypp/parser/IniDict.h"
+#include "zypp/sat/Pool.h"
+
using namespace std;
using namespace zypp::filesystem;
using namespace zypp::parser;
+#undef ZYPP_BASE_LOGGER_LOGGROUP
+#define ZYPP_BASE_LOGGER_LOGGROUP "zconfig"
+
///////////////////////////////////////////////////////////////////
namespace zypp
{ /////////////////////////////////////////////////////////////////
Arch architecture( buf.machine );
MIL << "Uname architecture is '" << buf.machine << "'" << endl;
- // some CPUs report i686 but dont implement cx8 and cmov
- // check for both flags in /proc/cpuinfo and downgrade
- // to i586 if either is missing (cf bug #18885)
if ( architecture == Arch_i686 )
{
+ // some CPUs report i686 but dont implement cx8 and cmov
+ // check for both flags in /proc/cpuinfo and downgrade
+ // to i586 if either is missing (cf bug #18885)
std::ifstream cpuinfo( "/proc/cpuinfo" );
if ( cpuinfo )
{
ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
}
}
+ else if ( architecture == Arch_sparc || architecture == Arch_sparc64 )
+ {
+ // Check for sun4[vum] to get the real arch. (bug #566291)
+ std::ifstream cpuinfo( "/proc/cpuinfo" );
+ if ( cpuinfo )
+ {
+ for( iostr::EachLine in( cpuinfo ); in; in.next() )
+ {
+ if ( str::hasPrefix( *in, "type" ) )
+ {
+ if ( in->find( "sun4v" ) != std::string::npos )
+ {
+ architecture = ( architecture == Arch_sparc64 ? Arch_sparc64v : Arch_sparcv9v );
+ WAR << "CPU has 'sun4v': architecture upgraded to '" << architecture << "'" << endl;
+ }
+ else if ( in->find( "sun4u" ) != std::string::npos )
+ {
+ architecture = ( architecture == Arch_sparc64 ? Arch_sparc64 : Arch_sparcv9 );
+ WAR << "CPU has 'sun4u': architecture upgraded to '" << architecture << "'" << endl;
+ }
+ else if ( in->find( "sun4m" ) != std::string::npos )
+ {
+ architecture = Arch_sparcv8;
+ WAR << "CPU has 'sun4m': architecture upgraded to '" << architecture << "'" << endl;
+ }
+ break;
+ }
+ }
+ }
+ else
+ {
+ ERR << "Cant open " << PathInfo("/proc/cpuinfo") << endl;
+ }
+ }
return architecture;
}
}
}
MIL << "Default text locale is '" << ret << "'" << endl;
+#warning HACK AROUND BOOST_TEST_CATCH_SYSTEM_ERRORS
+ setenv( "BOOST_TEST_CATCH_SYSTEM_ERRORS", "no", 1 );
return ret;
}
} // namespace zypp
///////////////////////////////////////////////////////////////////
+ /** Mutable option. */
+ template<class _Tp>
+ struct Option
+ {
+ typedef _Tp value_type;
+
+ /** No default ctor, explicit initialisation! */
+ Option( const value_type & initial_r )
+ : _val( initial_r )
+ {}
+
+ /** Get the value. */
+ const value_type & get() const
+ { return _val; }
+
+ /** Autoconversion to value_type. */
+ operator const value_type &() const
+ { return _val; }
+
+ /** Set a new value. */
+ void set( const value_type & newval_r )
+ { _val = newval_r; }
+
+ /** Non-const reference to set a new value. */
+ value_type & ref()
+ { return _val; }
+
+ private:
+ value_type _val;
+ };
+
+ /** Mutable option with initial value also remembering a config value. */
+ template<class _Tp>
+ struct DefaultOption : public Option<_Tp>
+ {
+ typedef _Tp value_type;
+ typedef Option<_Tp> option_type;
+
+ DefaultOption( const value_type & initial_r )
+ : Option<_Tp>( initial_r ), _default( initial_r )
+ {}
+
+ /** Reset value to the current default. */
+ void restoreToDefault()
+ { this->set( _default.get() ); }
+
+ /** Reset value to a new default. */
+ void restoreToDefault( const value_type & newval_r )
+ { setDefault( newval_r ); restoreToDefault(); }
+
+ /** Get the current default value. */
+ const value_type & getDefault() const
+ { return _default.get(); }
+
+ /** Set a new default value. */
+ void setDefault( const value_type & newval_r )
+ { _default.set( newval_r ); }
+
+ private:
+ option_type _default;
+ };
+
///////////////////////////////////////////////////////////////////
//
// CLASS NAME : ZConfig::Impl
class ZConfig::Impl
{
public:
- Impl()
- : cfg_arch ( defaultSystemArchitecture() )
- , cfg_textLocale ( defaultTextLocale() )
- , repo_add_probe ( false )
- , repo_refresh_delay ( 10 )
- , download_use_patchrpm ( true )
- , download_use_deltarpm ( true )
-
+ Impl( const Pathname & override_r = Pathname() )
+ : _parsedZyppConf ( override_r )
+ , cfg_arch ( defaultSystemArchitecture() )
+ , cfg_textLocale ( defaultTextLocale() )
+ , updateMessagesNotify ( "single | /usr/lib/zypp/notify-message -p %p" )
+ , repo_add_probe ( false )
+ , repo_refresh_delay ( 10 )
+ , repoLabelIsAlias ( false )
+ , download_use_deltarpm ( true )
+ , download_use_deltarpm_always ( false )
+ , download_media_prefer_download( true )
+ , download_max_concurrent_connections( 5 )
+ , download_min_download_speed ( 0 )
+ , download_max_download_speed ( 0 )
+ , download_max_silent_tries ( 5 )
+ , commit_downloadMode ( DownloadDefault )
+ , solver_onlyRequires ( false )
+ , solver_allowVendorChange ( false )
+ , solver_cleandepsOnRemove ( false )
+ , solver_upgradeTestcasesToKeep ( 2 )
+ , solverUpgradeRemoveDroppedPackages( true )
+ , apply_locks_file ( true )
+ , pluginsPath ( "/usr/lib/zypp/plugins" )
{
MIL << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl;
-
- // ZYPP_CONF might override /etc/zypp/zypp.conf
- const char *env_confpath = getenv( "ZYPP_CONF" );
- Pathname confpath( env_confpath ? env_confpath : "/etc/zypp/zypp.conf" );
- if ( PathInfo(confpath).isExist() )
+ // override_r has higest prio
+ // ZYPP_CONF might override /etc/zypp/zypp.conf
+ if ( _parsedZyppConf.empty() )
{
- parser::IniDict dict( confpath );
- //InputStream is(confpath);
-
+ const char *env_confpath = getenv( "ZYPP_CONF" );
+ _parsedZyppConf = env_confpath ? env_confpath : "/etc/zypp/zypp.conf";
+ }
+ else
+ {
+ // Inject this into ZConfig. Be shure this is
+ // allocated via new. See: reconfigureZConfig
+ INT << "Reconfigure to " << _parsedZyppConf << endl;
+ ZConfig::instance()._pimpl.reset( this );
+ }
+ if ( PathInfo(_parsedZyppConf).isExist() )
+ {
+ parser::IniDict dict( _parsedZyppConf );
for ( IniDict::section_const_iterator sit = dict.sectionsBegin();
sit != dict.sectionsEnd();
++sit )
cfg_arch = carch;
}
}
+ else if ( entry == "cachedir" )
+ {
+ cfg_cache_path = Pathname(value);
+ }
else if ( entry == "metadatadir" )
{
cfg_metadata_path = Pathname(value);
}
+ else if ( entry == "solvfilesdir" )
+ {
+ cfg_solvfiles_path = Pathname(value);
+ }
+ else if ( entry == "packagesdir" )
+ {
+ cfg_packages_path = Pathname(value);
+ }
+ else if ( entry == "configdir" )
+ {
+ cfg_config_path = Pathname(value);
+ }
else if ( entry == "reposdir" )
{
cfg_known_repos_path = Pathname(value);
}
- else if ( entry == "cachedir" )
+ else if ( entry == "servicesdir" )
{
- cfg_cache_path = Pathname(value);
+ cfg_known_services_path = Pathname(value);
}
else if ( entry == "repo.add.probe" )
{
{
str::strtonum(value, repo_refresh_delay);
}
- else if ( entry == "download.use_patchrpm" )
- {
- download_use_patchrpm = str::strToBool( value, download_use_patchrpm );
- }
else if ( entry == "download.use_deltarpm" )
{
download_use_deltarpm = str::strToBool( value, download_use_deltarpm );
}
+ else if ( entry == "download.use_deltarpm.always" )
+ {
+ download_use_deltarpm_always = str::strToBool( value, download_use_deltarpm_always );
+ }
+ else if ( entry == "download.media_preference" )
+ {
+ download_media_prefer_download.restoreToDefault( str::compareCI( value, "volatile" ) != 0 );
+ }
+ else if ( entry == "download.max_concurrent_connections" )
+ {
+ str::strtonum(value, download_max_concurrent_connections);
+ }
+ else if ( entry == "download.min_download_speed" )
+ {
+ str::strtonum(value, download_min_download_speed);
+ }
+ else if ( entry == "download.max_download_speed" )
+ {
+ str::strtonum(value, download_max_download_speed);
+ }
+ else if ( entry == "download.max_silent_tries" )
+ {
+ str::strtonum(value, download_max_silent_tries);
+ }
+ else if ( entry == "commit.downloadMode" )
+ {
+ commit_downloadMode.set( deserializeDownloadMode( value ) );
+ }
else if ( entry == "vendordir" )
{
cfg_vendor_path = Pathname(value);
}
- else if ( entry == "packagesdir" )
+ else if ( entry == "solver.onlyRequires" )
{
- cfg_packages_path = Pathname(value);
+ solver_onlyRequires.set( str::strToBool( value, solver_onlyRequires ) );
+ }
+ else if ( entry == "solver.allowVendorChange" )
+ {
+ solver_allowVendorChange.set( str::strToBool( value, solver_allowVendorChange ) );
+ }
+ else if ( entry == "solver.cleandepsOnRemove" )
+ {
+ solver_cleandepsOnRemove.set( str::strToBool( value, solver_cleandepsOnRemove ) );
+ }
+ else if ( entry == "solver.upgradeTestcasesToKeep" )
+ {
+ solver_upgradeTestcasesToKeep.set( str::strtonum<unsigned>( value ) );
+ }
+ else if ( entry == "solver.upgradeRemoveDroppedPackages" )
+ {
+ solverUpgradeRemoveDroppedPackages.restoreToDefault( str::strToBool( value, solverUpgradeRemoveDroppedPackages.getDefault() ) );
+ }
+ else if ( entry == "solver.checkSystemFile" )
+ {
+ solver_checkSystemFile = Pathname(value);
+ }
+ else if ( entry == "multiversion" )
+ {
+ str::split( value, inserter( multiversion, multiversion.end() ), ", \t" );
+ }
+ else if ( entry == "locksfile.path" )
+ {
+ locks_file = Pathname(value);
+ }
+ else if ( entry == "locksfile.apply" )
+ {
+ apply_locks_file = str::strToBool( value, apply_locks_file );
+ }
+ else if ( entry == "update.datadir" )
+ {
+ update_data_path = Pathname(value);
+ }
+ else if ( entry == "update.scriptsdir" )
+ {
+ update_scripts_path = Pathname(value);
+ }
+ else if ( entry == "update.messagessdir" )
+ {
+ update_messages_path = Pathname(value);
+ }
+ else if ( entry == "update.messages.notify" )
+ {
+ updateMessagesNotify.set( value );
+ }
+ else if ( entry == "rpm.install.excludedocs" )
+ {
+ rpmInstallFlags.setFlag( target::rpm::RPMINST_EXCLUDEDOCS,
+ str::strToBool( value, false ) );
+ }
+ else if ( entry == "history.logfile" )
+ {
+ history_log_path = Pathname(value);
+ }
+ else if ( entry == "credentials.global.dir" )
+ {
+ credentials_global_dir_path = Pathname(value);
+ }
+ else if ( entry == "credentials.global.file" )
+ {
+ credentials_global_file_path = Pathname(value);
}
}
}
}
else
{
- MIL << confpath << " not found, using defaults instead." << endl;
+ MIL << _parsedZyppConf << " not found, using defaults instead." << endl;
+ _parsedZyppConf = _parsedZyppConf.extend( " (NOT FOUND)" );
}
// legacy:
cfg_arch = carch;
}
}
-
MIL << "ZConfig singleton created." << endl;
- MIL << "defaultTextLocale: '" << cfg_textLocale << "'" << endl;
- MIL << "System architecture is '" << cfg_arch << "'" << endl;
}
~Impl()
{}
public:
+ /** Remember any parsed zypp.conf. */
+ Pathname _parsedZyppConf;
+
Arch cfg_arch;
Locale cfg_textLocale;
+ Pathname cfg_cache_path;
Pathname cfg_metadata_path;
+ Pathname cfg_solvfiles_path;
Pathname cfg_packages_path;
- Pathname cfg_cache_path;
+
+ Pathname cfg_config_path;
Pathname cfg_known_repos_path;
+ Pathname cfg_known_services_path;
+
Pathname cfg_vendor_path;
+ Pathname locks_file;
+
+ Pathname update_data_path;
+ Pathname update_scripts_path;
+ Pathname update_messages_path;
+ DefaultOption<std::string> updateMessagesNotify;
bool repo_add_probe;
unsigned repo_refresh_delay;
+ bool repoLabelIsAlias;
- bool download_use_patchrpm;
bool download_use_deltarpm;
+ bool download_use_deltarpm_always;
+ DefaultOption<bool> download_media_prefer_download;
+
+ int download_max_concurrent_connections;
+ int download_min_download_speed;
+ int download_max_download_speed;
+ int download_max_silent_tries;
+
+ Option<DownloadMode> commit_downloadMode;
+
+ Option<bool> solver_onlyRequires;
+ Option<bool> solver_allowVendorChange;
+ Option<bool> solver_cleandepsOnRemove;
+ Option<unsigned> solver_upgradeTestcasesToKeep;
+ DefaultOption<bool> solverUpgradeRemoveDroppedPackages;
+ Pathname solver_checkSystemFile;
+ std::set<std::string> multiversion;
+
+ bool apply_locks_file;
+
+ target::rpm::RpmInstFlags rpmInstallFlags;
+
+ Pathname history_log_path;
+ Pathname credentials_global_dir_path;
+ Pathname credentials_global_file_path;
+
+ Option<Pathname> pluginsPath;
};
///////////////////////////////////////////////////////////////////
+ // Backdoor to redirect ZConfig from within the running
+ // TEST-application. HANDLE WITH CARE!
+ void reconfigureZConfig( const Pathname & override_r )
+ {
+ // ctor puts itself unter smart pointer control.
+ new ZConfig::Impl( override_r );
+ }
+
///////////////////////////////////////////////////////////////////
//
// METHOD NAME : ZConfig::instance
//
ZConfig::ZConfig()
: _pimpl( new Impl )
- {}
+ {
+ about( MIL );
+ }
///////////////////////////////////////////////////////////////////
//
ZConfig::~ZConfig( )
{}
+ Pathname ZConfig::systemRoot() const
+ {
+ Target_Ptr target( getZYpp()->getTarget() );
+ return target ? target->root() : Pathname();
+ }
+
///////////////////////////////////////////////////////////////////
//
// system architecture
{
WAR << "Overriding text locale (" << _pimpl->cfg_textLocale << "): " << locale_r << endl;
_pimpl->cfg_textLocale = locale_r;
+#warning prefer signal
+ sat::Pool::instance().setTextLocale( locale_r );
}
}
///////////////////////////////////////////////////////////////////
+ Pathname ZConfig::repoCachePath() const
+ {
+ return ( _pimpl->cfg_cache_path.empty()
+ ? Pathname("/var/cache/zypp") : _pimpl->cfg_cache_path );
+ }
+
Pathname ZConfig::repoMetadataPath() const
{
return ( _pimpl->cfg_metadata_path.empty()
- ? Pathname("/var/cache/zypp/raw") : _pimpl->cfg_metadata_path );
+ ? (repoCachePath()/"raw") : _pimpl->cfg_metadata_path );
+ }
+
+ Pathname ZConfig::repoSolvfilesPath() const
+ {
+ return ( _pimpl->cfg_solvfiles_path.empty()
+ ? (repoCachePath()/"solv") : _pimpl->cfg_solvfiles_path );
}
Pathname ZConfig::repoPackagesPath() const
{
return ( _pimpl->cfg_packages_path.empty()
- ? Pathname("/var/cache/zypp/packages") : _pimpl->cfg_packages_path );
+ ? (repoCachePath()/"packages") : _pimpl->cfg_packages_path );
}
- Pathname ZConfig::repoCachePath() const
+ ///////////////////////////////////////////////////////////////////
+
+ Pathname ZConfig::configPath() const
{
- return ( _pimpl->cfg_cache_path.empty()
- ? Pathname("/var/cache/zypp") : _pimpl->cfg_cache_path );
+ return ( _pimpl->cfg_config_path.empty()
+ ? Pathname("/etc/zypp") : _pimpl->cfg_config_path );
}
Pathname ZConfig::knownReposPath() const
{
return ( _pimpl->cfg_known_repos_path.empty()
- ? Pathname("/etc/zypp/repos.d") : _pimpl->cfg_known_repos_path );
+ ? (configPath()/"repos.d") : _pimpl->cfg_known_repos_path );
}
- const std::string & ZConfig::cacheDBSplitJoinSeparator() const
+ Pathname ZConfig::knownServicesPath() const
{
- static std::string s("!@$");
- return s;
+ return ( _pimpl->cfg_known_services_path.empty()
+ ? (configPath()/"services.d") : _pimpl->cfg_known_repos_path );
}
+ Pathname ZConfig::vendorPath() const
+ {
+ return ( _pimpl->cfg_vendor_path.empty()
+ ? (configPath()/"vendors.d") : _pimpl->cfg_vendor_path );
+ }
+
+ Pathname ZConfig::locksFile() const
+ {
+ return ( _pimpl->locks_file.empty()
+ ? (configPath()/"locks") : _pimpl->locks_file );
+ }
+
+ ///////////////////////////////////////////////////////////////////
+
bool ZConfig::repo_add_probe() const
{
return _pimpl->repo_add_probe;
return _pimpl->repo_refresh_delay;
}
- bool ZConfig::download_use_patchrpm() const
- { return _pimpl->download_use_patchrpm; }
+ bool ZConfig::repoLabelIsAlias() const
+ { return _pimpl->repoLabelIsAlias; }
+
+ void ZConfig::repoLabelIsAlias( bool yesno_r )
+ { _pimpl->repoLabelIsAlias = yesno_r; }
bool ZConfig::download_use_deltarpm() const
{ return _pimpl->download_use_deltarpm; }
- Pathname ZConfig::vendorPath() const
+ bool ZConfig::download_use_deltarpm_always() const
+ { return download_use_deltarpm() && _pimpl->download_use_deltarpm_always; }
+
+ bool ZConfig::download_media_prefer_download() const
+ { return _pimpl->download_media_prefer_download; }
+
+ void ZConfig::set_download_media_prefer_download( bool yesno_r )
+ { _pimpl->download_media_prefer_download.set( yesno_r ); }
+
+ void ZConfig::set_default_download_media_prefer_download()
+ { _pimpl->download_media_prefer_download.restoreToDefault(); }
+
+ long ZConfig::download_max_concurrent_connections() const
+ { return _pimpl->download_max_concurrent_connections; }
+
+ long ZConfig::download_min_download_speed() const
+ { return _pimpl->download_min_download_speed; }
+
+ long ZConfig::download_max_download_speed() const
+ { return _pimpl->download_max_download_speed; }
+
+ long ZConfig::download_max_silent_tries() const
+ { return _pimpl->download_max_silent_tries; }
+
+ DownloadMode ZConfig::commit_downloadMode() const
+ { return _pimpl->commit_downloadMode; }
+
+ bool ZConfig::solver_onlyRequires() const
+ { return _pimpl->solver_onlyRequires; }
+
+ bool ZConfig::solver_allowVendorChange() const
+ { return _pimpl->solver_allowVendorChange; }
+
+ bool ZConfig::solver_cleandepsOnRemove() const
+ { return _pimpl->solver_cleandepsOnRemove; }
+
+ Pathname ZConfig::solver_checkSystemFile() const
+ { return ( _pimpl->solver_checkSystemFile.empty()
+ ? (configPath()/"systemCheck") : _pimpl->solver_checkSystemFile ); }
+
+ unsigned ZConfig::solver_upgradeTestcasesToKeep() const
+ { return _pimpl->solver_upgradeTestcasesToKeep; }
+
+ bool ZConfig::solverUpgradeRemoveDroppedPackages() const { return _pimpl->solverUpgradeRemoveDroppedPackages; }
+ void ZConfig::setSolverUpgradeRemoveDroppedPackages( bool val_r ) { _pimpl->solverUpgradeRemoveDroppedPackages.set( val_r ); }
+ void ZConfig::resetSolverUpgradeRemoveDroppedPackages() { _pimpl->solverUpgradeRemoveDroppedPackages.restoreToDefault(); }
+
+ const std::set<std::string> & ZConfig::multiversionSpec() const { return _pimpl->multiversion; }
+ void ZConfig::addMultiversionSpec( const std::string & name_r ) { _pimpl->multiversion.insert( name_r ); }
+ void ZConfig::removeMultiversionSpec( const std::string & name_r ) { _pimpl->multiversion.erase( name_r ); }
+
+ bool ZConfig::apply_locks_file() const
+ { return _pimpl->apply_locks_file; }
+
+ Pathname ZConfig::update_dataPath() const
{
- return ( _pimpl->cfg_vendor_path.empty()
- ? Pathname("/etc/zypp/vendors.d") : _pimpl->cfg_vendor_path );
+ return ( _pimpl->update_data_path.empty()
+ ? Pathname("/var/adm") : _pimpl->update_data_path );
+ }
+
+ Pathname ZConfig::update_messagesPath() const
+ {
+ return ( _pimpl->update_messages_path.empty()
+ ? Pathname(update_dataPath()/"update-messages") : _pimpl->update_messages_path );
+ }
+
+ Pathname ZConfig::update_scriptsPath() const
+ {
+ return ( _pimpl->update_scripts_path.empty()
+ ? Pathname(update_dataPath()/"update-scripts") : _pimpl->update_scripts_path );
+ }
+
+ std::string ZConfig::updateMessagesNotify() const
+ { return _pimpl->updateMessagesNotify; }
+
+ void ZConfig::setUpdateMessagesNotify( const std::string & val_r )
+ { _pimpl->updateMessagesNotify.set( val_r ); }
+
+ void ZConfig::resetUpdateMessagesNotify()
+ { _pimpl->updateMessagesNotify.restoreToDefault(); }
+
+ ///////////////////////////////////////////////////////////////////
+
+ target::rpm::RpmInstFlags ZConfig::rpmInstallFlags() const
+ { return _pimpl->rpmInstallFlags; }
+
+
+ Pathname ZConfig::historyLogFile() const
+ {
+ return ( _pimpl->history_log_path.empty() ?
+ Pathname("/var/log/zypp/history") : _pimpl->history_log_path );
+ }
+
+
+ Pathname ZConfig::credentialsGlobalDir() const
+ {
+ return ( _pimpl->credentials_global_dir_path.empty() ?
+ Pathname("/etc/zypp/credentials.d") : _pimpl->credentials_global_dir_path );
+ }
+
+ Pathname ZConfig::credentialsGlobalFile() const
+ {
+ return ( _pimpl->credentials_global_file_path.empty() ?
+ Pathname("/etc/zypp/credentials.cat") : _pimpl->credentials_global_file_path );
+ }
+
+ ///////////////////////////////////////////////////////////////////
+
+ std::string ZConfig::distroverpkg() const
+ { return "redhat-release"; }
+
+ ///////////////////////////////////////////////////////////////////
+
+ Pathname ZConfig::pluginsPath() const
+ { return _pimpl->pluginsPath.get(); }
+
+ ///////////////////////////////////////////////////////////////////
+
+ std::ostream & ZConfig::about( std::ostream & str ) const
+ {
+ str << "libzypp: " << VERSION << " built " << __DATE__ << " " << __TIME__ << endl;
+
+ str << "libsolv: " << sat_version;
+ if ( ::strcmp( sat_version, LIBSOLV_VERSION_STRING ) )
+ str << " (built against " << LIBSOLV_VERSION_STRING << ")";
+ str << endl;
+
+ str << "zypp.conf: '" << _pimpl->_parsedZyppConf << "'" << endl;
+ str << "TextLocale: '" << textLocale() << "' (" << defaultTextLocale() << ")" << endl;
+ str << "SystemArchitecture: '" << systemArchitecture() << "' (" << defaultSystemArchitecture() << ")" << endl;
+ return str;
}
/////////////////////////////////////////////////////////////////