{
#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;
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;
}
} // namespace zypp
///////////////////////////////////////////////////////////////////
- /** Mutable option with initial value. */
- template<class _Tp, _Tp _Initial>
+ /** Mutable option. */
+ template<class _Tp>
struct Option
{
typedef _Tp value_type;
- Option()
- : _val( _Initial )
+ /** No default ctor, explicit initialisation! */
+ Option( const value_type & initial_r )
+ : _val( initial_r )
{}
- value_type get() const
+ /** 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, _Tp _Initial>
- struct DefaultOption : public Option<_Tp,_Initial>
+ template<class _Tp>
+ struct DefaultOption : public Option<_Tp>
{
- typedef _Tp value_type;
- typedef Option<_Tp,_Initial> option_type;
+ typedef _Tp value_type;
+ typedef Option<_Tp> option_type;
- void restoreDefault()
+ 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() ); }
- void restoreDefault( const value_type & newval_r )
- { setDefault( newval_r ); restoreDefault(); }
+ /** Reset value to a new default. */
+ void restoreToDefault( const value_type & newval_r )
+ { setDefault( newval_r ); restoreToDefault(); }
- value_type getDefault() const
+ /** 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 ); }
: _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_max_concurrent_connections(2)
- , download_min_download_speed(0)
- , download_max_download_speed(0)
- , download_max_silent_tries(5)
- , solver_onlyRequires ( false )
- , apply_locks_file ( true )
-
+ , 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;
// override_r has higest prio
}
else if ( entry == "download.media_preference" )
{
- download_media_prefer_download.restoreDefault( str::compareCI( value, "volatile" ) != 0 );
+ download_media_prefer_download.restoreToDefault( str::compareCI( value, "volatile" ) != 0 );
}
else if ( entry == "download.max_concurrent_connections" )
{
{
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 == "productsdir" )
+ else if ( entry == "solver.onlyRequires" )
{
- WAR << "Deprecated entry 'productsdir=': This locations is no longer used or supported." << endl;
- cfg_products_path = Pathname(value);
+ solver_onlyRequires.set( str::strToBool( value, solver_onlyRequires ) );
}
- else if ( entry == "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_onlyRequires = str::strToBool( value, solver_onlyRequires );
+ solver_upgradeTestcasesToKeep.set( str::strtonum<unsigned>( value ) );
+ }
+ else if ( entry == "solver.upgradeRemoveDroppedPackages" )
+ {
+ solverUpgradeRemoveDroppedPackages.restoreToDefault( str::strToBool( value, solverUpgradeRemoveDroppedPackages.getDefault() ) );
}
else if ( entry == "solver.checkSystemFile" )
{
}
else if ( entry == "multiversion" )
{
- std::list<std::string> multi;
- str::split( value, back_inserter(multi), ", \t" );
- for ( std::list<string>::const_iterator it = multi.begin();
- it != multi.end(); it++) {
- multiversion.insert (IdString(*it));
- }
+ str::split( value, inserter( multiversion, multiversion.end() ), ", \t" );
}
else if ( entry == "locksfile.path" )
{
{
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 );
+ rpmInstallFlags.setFlag( target::rpm::RPMINST_EXCLUDEDOCS,
+ str::strToBool( value, false ) );
}
else if ( entry == "history.logfile" )
{
else
{
MIL << _parsedZyppConf << " not found, using defaults instead." << endl;
- _parsedZyppConf.extend( " (NOT FOUND)" );
+ _parsedZyppConf = _parsedZyppConf.extend( " (NOT FOUND)" );
}
// legacy:
Pathname cfg_config_path;
Pathname cfg_known_repos_path;
Pathname cfg_known_services_path;
+
Pathname cfg_vendor_path;
- Pathname cfg_products_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_deltarpm;
bool download_use_deltarpm_always;
- DefaultOption<bool,true> download_media_prefer_download;
+ 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;
- bool solver_onlyRequires;
+ 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<IdString> multiversion;
+ std::set<std::string> multiversion;
bool apply_locks_file;
Pathname history_log_path;
Pathname credentials_global_dir_path;
Pathname credentials_global_file_path;
+
+ Option<Pathname> pluginsPath;
};
///////////////////////////////////////////////////////////////////
ZConfig::ZConfig()
: _pimpl( new Impl )
{
- about( MIL);
+ 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 );
}
}
? (configPath()/"vendors.d") : _pimpl->cfg_vendor_path );
}
- Pathname ZConfig::productsPath() const
- {
- return ( _pimpl->cfg_products_path.empty()
- ? (configPath()/"products.d") : _pimpl->cfg_products_path );
- }
-
Pathname ZConfig::locksFile() const
{
return ( _pimpl->locks_file.empty()
return _pimpl->repo_refresh_delay;
}
+ 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; }
{ return download_use_deltarpm() && _pimpl->download_use_deltarpm_always; }
bool ZConfig::download_media_prefer_download() const
- { return _pimpl->download_media_prefer_download.get(); }
+ { 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.restoreDefault(); }
+ { _pimpl->download_media_prefer_download.restoreToDefault(); }
long ZConfig::download_max_concurrent_connections() const
{ return _pimpl->download_max_concurrent_connections; }
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 ); }
- std::set<IdString> ZConfig::multiversion() const
- { return _pimpl->multiversion; }
+ unsigned ZConfig::solver_upgradeTestcasesToKeep() const
+ { return _pimpl->solver_upgradeTestcasesToKeep; }
- void ZConfig::addMultiversion(std::string &name)
- { _pimpl->multiversion.insert(IdString(name)); }
+ bool ZConfig::solverUpgradeRemoveDroppedPackages() const { return _pimpl->solverUpgradeRemoveDroppedPackages; }
+ void ZConfig::setSolverUpgradeRemoveDroppedPackages( bool val_r ) { _pimpl->solverUpgradeRemoveDroppedPackages.set( val_r ); }
+ void ZConfig::resetSolverUpgradeRemoveDroppedPackages() { _pimpl->solverUpgradeRemoveDroppedPackages.restoreToDefault(); }
- bool ZConfig::removeMultiversion(std::string &name)
- { return _pimpl->multiversion.erase(IdString(name)); }
+ 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;
- }
+ { return _pimpl->apply_locks_file; }
Pathname ZConfig::update_dataPath() const
{
? 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
///////////////////////////////////////////////////////////////////
+ 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;
projects / platform / upstream / libzypp.git / blobdiff