Author: mlandres Date: Wed Dec 10 16:08:27 2008 New Revision: 11921 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11921&view=rev Log: Remove obsolete zypp.conf::productsdir and deprecate ZConfig::productsPath() Modified: trunk/libzypp/zypp.conf trunk/libzypp/zypp/ZConfig.cc trunk/libzypp/zypp/ZConfig.h Modified: trunk/libzypp/zypp.conf URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp.conf?rev=11921&r1=11920&r2=11921&view=diff ============================================================================== --- trunk/libzypp/zypp.conf (original) +++ trunk/libzypp/zypp.conf Wed Dec 10 16:08:27 2008 @@ -167,18 +167,6 @@ ## -## Path where additional product information, .prod files are kept -## -## Valid values: A directory -## Default value: {configdir}/products.d -## -## Changing this is not recommended, as the directory might -## be populated by packages dropping files to /etc/zypp/products.d. -## -# productsdir = /etc/zypp/products.d - - -## ## Whether required packages are installed ONLY ## So recommended packages, language packages and packages which depend ## on hardware (modalias) will not be regarded. Modified: trunk/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.cc?rev=11921&r1=11920&r2=11921&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.cc (original) +++ trunk/libzypp/zypp/ZConfig.cc Wed Dec 10 16:08:27 2008 @@ -246,6 +246,7 @@ } else if ( entry == "productsdir" ) { + WAR << "Deprecated entry 'productsdir=': This locations is no longer used or supported." << endl; cfg_products_path = Pathname(value); } else if ( entry == "solver.onlyRequires" ) Modified: trunk/libzypp/zypp/ZConfig.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/ZConfig.h?rev=11921&r1=11920&r2=11921&view=diff ============================================================================== --- trunk/libzypp/zypp/ZConfig.h (original) +++ trunk/libzypp/zypp/ZConfig.h Wed Dec 10 16:08:27 2008 @@ -173,8 +173,9 @@ /** * Directory for additional product information (configPath()/products.d) * \ingroup g_ZC_CONFIGFILES + * \deprecated This locations is no longer used or supported. */ - Pathname productsPath() const; + Pathname productsPath() const ZYPP_DEPRECATED; /** * Solver regards required packages,patterns,... only -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org