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