Author: mlandres Date: Fri Aug 8 18:13:28 2008 New Revision: 10808 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10808&view=rev Log: prepare default options for package install (e.g. excludedocs) Modified: trunk/libzypp/zypp.conf trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h trunk/libzypp/zypp/target/TargetImpl.cc Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=10808&r1=10807&r2=10808&view=diff ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Fri Aug 8 18:13:28 2008 @@ -147,8 +147,8 @@ ## vendors = nvidia,suse,opensuse ## ## ------------------------- file contains end ----------------------- -## Libzypp makes an string comparision (like strncmp, case-insensitive) -## whereas the beginning of the strings are compared only. +## Libzypp makes an string comparision (like strncmp, case-insensitive) +## whereas the beginning of the strings are compared only. ## e.G. vendor "opensuse11.0" is compatible to "openSuSE". ## ## Valid values: A directory @@ -180,12 +180,12 @@ # solver.onlyRequires = false ## -## This file contains requirements/conflicts which fulfill the +## This file contains requirements/conflicts which fulfill the ## needs of a running system. ## For example the system would be broken if not glibc or kernel is -## installed. +## installed. ## So the user will be informed if these packages will be deleted. -## +## ## format: Each line represents one dependency: ## e.g. ## requires:kernel @@ -194,7 +194,7 @@ # solver.checkSystemFile = /etc/zypp/systemCheck ## -## Packages which are parallel installable with +## Packages which are parallel installable with ## diffent versions ## # multiversion = kernel-default,kernel-smp @@ -241,4 +241,12 @@ ## # update.scriptsdir = /var/adm/update-scripts - +## +## Options for package installation: excludedocs +## +## Don't install any files which are marked as documentation. +## +## Valid values: boolean +## Default value: no +## +# rpm.install.excludedocs = no Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=10808&r1=10807&r2=10808&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Fri Aug 8 18:13:28 2008 @@ -251,13 +251,13 @@ } else if ( entry == "multiversion" ) { - std::liststd::string multi; + std::liststd::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)); + multiversion.insert (IdString(*it)); } - } + } else if ( entry == "locksfile.path" ) { locks_file = Pathname(value); @@ -278,7 +278,10 @@ { update_messages_path = Pathname(value); } - + else if ( entry == "rpm.install.excludedocs" ) + { + rpmInstallExcludedocs = true; + } } } } @@ -334,11 +337,13 @@ bool solver_onlyRequires; Pathname solver_checkSystemFile; - - std::set<IdString> multiversion; + + std::set<IdString> multiversion; bool apply_locks_file; + DefaultIntegral rpmInstallExcludedocs; + }; /////////////////////////////////////////////////////////////////// @@ -524,9 +529,9 @@ void ZConfig::addMultiversion(std::string &name) { _pimpl->multiversion.insert(IdString(name)); } - + bool ZConfig::removeMultiversion(std::string &name) - { return _pimpl->multiversion.erase(IdString(name)); } + { return _pimpl->multiversion.erase(IdString(name)); } bool ZConfig::apply_locks_file() const { @@ -552,6 +557,11 @@ ? Pathname(update_dataPath()/"update-scripts") : _pimpl->update_scripts_path ); } + /////////////////////////////////////////////////////////////////// + + bool ZConfig::rpmInstallExcludedocs() const + { return _pimpl->rpmInstallExcludedocs; } + ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=10808&r1=10807&r2=10808&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Fri Aug 8 18:13:28 2008 @@ -186,10 +186,10 @@ /** * Packages which can be installed parallel with different versions * Returning a set of package names (IdString) - */ + */ std::set<IdString> multiversion() const; void addMultiversion(std::string &name); - bool removeMultiversion(std::string &name); + bool removeMultiversion(std::string &name); /** * Path where zypp can find or create lock file (configPath()/locks) @@ -198,7 +198,7 @@ Pathname locksFile() const; /** - * Whether locks file should be read and applied after start + * Whether locks file should be read and applied after start (true) */ bool apply_locks_file() const; @@ -220,6 +220,13 @@ Pathname update_messagesPath() const; public: + /** \name Options for package installation */ + //@{ + /** Don't install any files which are marked as documentation (false). */ + bool rpmInstallExcludedocs() const; + //@} + + public: class Impl; /** Dtor */ ~ZConfig(); Modified: trunk/libzypp/zypp/target/TargetImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/TargetImpl.cc?rev=10808&r1=10807&r2=10808&view=diff ============================================================================== --- trunk/libzypp/zypp/target/TargetImpl.cc (original) +++ trunk/libzypp/zypp/target/TargetImpl.cc Fri Aug 8 18:13:28 2008 @@ -291,11 +291,11 @@ // create the anonymous unique id // this value is used for statistics Pathname idpath( home() / "AnonymousUniqueId"); - + if ( ! PathInfo( idpath ).isExist() ) { MIL << "creating anonymous unique id" << endl; - + // if the file does not exist we need to generate the uuid file const char* argv[] = { @@ -321,7 +321,7 @@ line = prog.receiveLine() ) { MIL << line << endl; - + idfile << line; } prog.close(); @@ -730,6 +730,7 @@ // if (p->installOnly()) flags |= rpm::RpmDb::RPMINST_NOUPGRADE; if (policy_r.dryRun()) flags |= rpm::RpmDb::RPMINST_TEST; + if (policy_r.rpmExcludeDocs()) flags |= rpm::RpmDb::RPMINST_NODOCS; if (policy_r.rpmNoSignature()) flags |= rpm::RpmDb::RPMINST_NOSIGNATURE; try -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org