Remove obsolete zypp.conf::productsdir and deprecate ZConfig::productsPath()

diff --git a/zypp.conf b/zypp.conf
index b25c5f1..0e089e0 100644 (file)
--- a/zypp.conf
+++ b/zypp.conf
@@ -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.

diff --git a/zypp/ZConfig.cc b/zypp/ZConfig.cc
index 6c1d4a2..816b5fc 100644 (file)
--- a/zypp/ZConfig.cc
+++ b/zypp/ZConfig.cc
@@ -246,6 +246,7 @@ namespace zypp
                 }
                 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" )

diff --git a/zypp/ZConfig.h b/zypp/ZConfig.h
index 9d82401..9052ae9 100644 (file)
--- a/zypp/ZConfig.h
+++ b/zypp/ZConfig.h
@@ -173,8 +173,9 @@ namespace zypp
       /**
        * 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